* [PATCH 1/3] arm64: dts: qcom: sm8650-hdk: add port mapping to speakers
2024-06-27 12:57 [PATCH 0/3] arm64: qcom: sm8650: add port mapping to speakers Neil Armstrong
@ 2024-06-27 12:57 ` Neil Armstrong
2024-06-27 13:40 ` Konrad Dybcio
2024-06-27 14:17 ` Krzysztof Kozlowski
2024-06-27 12:57 ` [PATCH 2/3] arm64: dts: qcom: sm8650-mtp: " Neil Armstrong
` (2 subsequent siblings)
3 siblings, 2 replies; 11+ messages in thread
From: Neil Armstrong @ 2024-06-27 12:57 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley
Cc: linux-arm-msm, devicetree, linux-kernel, Neil Armstrong
Add appropriate mappings of Soundwire ports of WSA8845 speaker
to correctly map the Speaker ports to the WSA macro ports.
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
---
arch/arm64/boot/dts/qcom/sm8650-hdk.dts | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/sm8650-hdk.dts b/arch/arm64/boot/dts/qcom/sm8650-hdk.dts
index eb2f910b4f58..591e6ab9bf5b 100644
--- a/arch/arm64/boot/dts/qcom/sm8650-hdk.dts
+++ b/arch/arm64/boot/dts/qcom/sm8650-hdk.dts
@@ -1137,6 +1137,16 @@ north_spkr: speaker@0,0 {
sound-name-prefix = "SpkrLeft";
vdd-1p8-supply = <&vreg_l15b_1p8>;
vdd-io-supply = <&vreg_l3c_1p2>;
+
+ /*
+ * WSA8845 Port 1 (DAC) <=> SWR0 Port 1 (SPKR_L)
+ * WSA8845 Port 2 (COMP) <=> SWR0 Port 2 (SPKR_L_COMP)
+ * WSA8845 Port 3 (BOOST) <=> SWR0 Port 3 (SPKR_L_BOOST)
+ * WSA8845 Port 4 (PBR) <=> SWR0 Port 7 (PBR)
+ * WSA8845 Port 5 (VISENSE) <=> SWR0 Port 10 (SPKR_L_VI)
+ * WSA8845 Port 6 (CPS) <=> SWR0 Port 13 (CPS)
+ */
+ qcom,port-mapping = <1 2 3 7 10 13>;
};
/* WSA8845, Speaker South */
@@ -1150,6 +1160,16 @@ south_spkr: speaker@0,1 {
sound-name-prefix = "SpkrRight";
vdd-1p8-supply = <&vreg_l15b_1p8>;
vdd-io-supply = <&vreg_l3c_1p2>;
+
+ /*
+ * WSA8845 Port 1 (DAC) <=> SWR0 Port 4 (SPKR_R)
+ * WSA8845 Port 2 (COMP) <=> SWR0 Port 5 (SPKR_R_COMP)
+ * WSA8845 Port 3 (BOOST) <=> SWR0 Port 6 (SPKR_R_BOOST)
+ * WSA8845 Port 4 (PBR) <=> SWR0 Port 7 (PBR)
+ * WSA8845 Port 5 (VISENSE) <=> SWR0 Port 11 (SPKR_R_VI)
+ * WSA8845 Port 6 (CPS) <=> SWR0 Port 13 (CPS)
+ */
+ qcom,port-mapping = <4 5 6 7 11 13>;
};
};
--
2.34.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH 1/3] arm64: dts: qcom: sm8650-hdk: add port mapping to speakers
2024-06-27 12:57 ` [PATCH 1/3] arm64: dts: qcom: sm8650-hdk: " Neil Armstrong
@ 2024-06-27 13:40 ` Konrad Dybcio
2024-06-27 14:17 ` Krzysztof Kozlowski
1 sibling, 0 replies; 11+ messages in thread
From: Konrad Dybcio @ 2024-06-27 13:40 UTC (permalink / raw)
To: Neil Armstrong, Bjorn Andersson, Rob Herring, Krzysztof Kozlowski,
Conor Dooley
Cc: linux-arm-msm, devicetree, linux-kernel
On 27.06.2024 2:57 PM, Neil Armstrong wrote:
> Add appropriate mappings of Soundwire ports of WSA8845 speaker
> to correctly map the Speaker ports to the WSA macro ports.
>
> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
> ---
> arch/arm64/boot/dts/qcom/sm8650-hdk.dts | 20 ++++++++++++++++++++
> 1 file changed, 20 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/qcom/sm8650-hdk.dts b/arch/arm64/boot/dts/qcom/sm8650-hdk.dts
> index eb2f910b4f58..591e6ab9bf5b 100644
> --- a/arch/arm64/boot/dts/qcom/sm8650-hdk.dts
> +++ b/arch/arm64/boot/dts/qcom/sm8650-hdk.dts
> @@ -1137,6 +1137,16 @@ north_spkr: speaker@0,0 {
> sound-name-prefix = "SpkrLeft";
> vdd-1p8-supply = <&vreg_l15b_1p8>;
> vdd-io-supply = <&vreg_l3c_1p2>;
> +
> + /*
> + * WSA8845 Port 1 (DAC) <=> SWR0 Port 1 (SPKR_L)
> + * WSA8845 Port 2 (COMP) <=> SWR0 Port 2 (SPKR_L_COMP)
> + * WSA8845 Port 3 (BOOST) <=> SWR0 Port 3 (SPKR_L_BOOST)
> + * WSA8845 Port 4 (PBR) <=> SWR0 Port 7 (PBR)
> + * WSA8845 Port 5 (VISENSE) <=> SWR0 Port 10 (SPKR_L_VI)
> + * WSA8845 Port 6 (CPS) <=> SWR0 Port 13 (CPS)
> + */
> + qcom,port-mapping = <1 2 3 7 10 13>;
> };
>
> /* WSA8845, Speaker South */
> @@ -1150,6 +1160,16 @@ south_spkr: speaker@0,1 {
> sound-name-prefix = "SpkrRight";
> vdd-1p8-supply = <&vreg_l15b_1p8>;
> vdd-io-supply = <&vreg_l3c_1p2>;
> +
> + /*
> + * WSA8845 Port 1 (DAC) <=> SWR0 Port 4 (SPKR_R)
> + * WSA8845 Port 2 (COMP) <=> SWR0 Port 5 (SPKR_R_COMP)
> + * WSA8845 Port 3 (BOOST) <=> SWR0 Port 6 (SPKR_R_BOOST)
> + * WSA8845 Port 4 (PBR) <=> SWR0 Port 7 (PBR)
> + * WSA8845 Port 5 (VISENSE) <=> SWR0 Port 11 (SPKR_R_VI)
> + * WSA8845 Port 6 (CPS) <=> SWR0 Port 13 (CPS)
> + */
> + qcom,port-mapping = <4 5 6 7 11 13>;
I'm assuming PBR and CPS being common is intentional
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Konrad
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH 1/3] arm64: dts: qcom: sm8650-hdk: add port mapping to speakers
2024-06-27 12:57 ` [PATCH 1/3] arm64: dts: qcom: sm8650-hdk: " Neil Armstrong
2024-06-27 13:40 ` Konrad Dybcio
@ 2024-06-27 14:17 ` Krzysztof Kozlowski
1 sibling, 0 replies; 11+ messages in thread
From: Krzysztof Kozlowski @ 2024-06-27 14:17 UTC (permalink / raw)
To: Neil Armstrong, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, devicetree, linux-kernel
On 27/06/2024 14:57, Neil Armstrong wrote:
> Add appropriate mappings of Soundwire ports of WSA8845 speaker
> to correctly map the Speaker ports to the WSA macro ports.
>
> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
> ---
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 2/3] arm64: dts: qcom: sm8650-mtp: add port mapping to speakers
2024-06-27 12:57 [PATCH 0/3] arm64: qcom: sm8650: add port mapping to speakers Neil Armstrong
2024-06-27 12:57 ` [PATCH 1/3] arm64: dts: qcom: sm8650-hdk: " Neil Armstrong
@ 2024-06-27 12:57 ` Neil Armstrong
2024-06-27 13:40 ` Konrad Dybcio
2024-06-27 14:18 ` Krzysztof Kozlowski
2024-06-27 12:57 ` [PATCH 3/3] arm64: dts: qcom: sm8650-qrd: " Neil Armstrong
2024-07-03 3:37 ` [PATCH 0/3] arm64: qcom: sm8650: " Bjorn Andersson
3 siblings, 2 replies; 11+ messages in thread
From: Neil Armstrong @ 2024-06-27 12:57 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley
Cc: linux-arm-msm, devicetree, linux-kernel, Neil Armstrong
Add appropriate mappings of Soundwire ports of WSA8845 speaker
to correctly map the Speaker ports to the WSA macro ports.
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
---
arch/arm64/boot/dts/qcom/sm8650-mtp.dts | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/sm8650-mtp.dts b/arch/arm64/boot/dts/qcom/sm8650-mtp.dts
index fa6c3b397f2d..c63822f5b127 100644
--- a/arch/arm64/boot/dts/qcom/sm8650-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sm8650-mtp.dts
@@ -751,6 +751,16 @@ left_spkr: speaker@0,0 {
sound-name-prefix = "SpkrLeft";
vdd-1p8-supply = <&vreg_l15b_1p8>;
vdd-io-supply = <&vreg_l3c_1p2>;
+
+ /*
+ * WSA8845 Port 1 (DAC) <=> SWR0 Port 1 (SPKR_L)
+ * WSA8845 Port 2 (COMP) <=> SWR0 Port 2 (SPKR_L_COMP)
+ * WSA8845 Port 3 (BOOST) <=> SWR0 Port 3 (SPKR_L_BOOST)
+ * WSA8845 Port 4 (PBR) <=> SWR0 Port 7 (PBR)
+ * WSA8845 Port 5 (VISENSE) <=> SWR0 Port 10 (SPKR_L_VI)
+ * WSA8845 Port 6 (CPS) <=> SWR0 Port 13 (CPS)
+ */
+ qcom,port-mapping = <1 2 3 7 10 13>;
};
/* WSA8845, Speaker Right */
@@ -764,6 +774,16 @@ right_spkr: speaker@0,1 {
sound-name-prefix = "SpkrRight";
vdd-1p8-supply = <&vreg_l15b_1p8>;
vdd-io-supply = <&vreg_l3c_1p2>;
+
+ /*
+ * WSA8845 Port 1 (DAC) <=> SWR0 Port 4 (SPKR_R)
+ * WSA8845 Port 2 (COMP) <=> SWR0 Port 5 (SPKR_R_COMP)
+ * WSA8845 Port 3 (BOOST) <=> SWR0 Port 6 (SPKR_R_BOOST)
+ * WSA8845 Port 4 (PBR) <=> SWR0 Port 7 (PBR)
+ * WSA8845 Port 5 (VISENSE) <=> SWR0 Port 11 (SPKR_R_VI)
+ * WSA8845 Port 6 (CPS) <=> SWR0 Port 13 (CPS)
+ */
+ qcom,port-mapping = <4 5 6 7 11 13>;
};
};
--
2.34.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH 2/3] arm64: dts: qcom: sm8650-mtp: add port mapping to speakers
2024-06-27 12:57 ` [PATCH 2/3] arm64: dts: qcom: sm8650-mtp: " Neil Armstrong
@ 2024-06-27 13:40 ` Konrad Dybcio
2024-06-27 14:18 ` Krzysztof Kozlowski
1 sibling, 0 replies; 11+ messages in thread
From: Konrad Dybcio @ 2024-06-27 13:40 UTC (permalink / raw)
To: Neil Armstrong, Bjorn Andersson, Rob Herring, Krzysztof Kozlowski,
Conor Dooley
Cc: linux-arm-msm, devicetree, linux-kernel
On 27.06.2024 2:57 PM, Neil Armstrong wrote:
> Add appropriate mappings of Soundwire ports of WSA8845 speaker
> to correctly map the Speaker ports to the WSA macro ports.
>
> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Konrad
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 2/3] arm64: dts: qcom: sm8650-mtp: add port mapping to speakers
2024-06-27 12:57 ` [PATCH 2/3] arm64: dts: qcom: sm8650-mtp: " Neil Armstrong
2024-06-27 13:40 ` Konrad Dybcio
@ 2024-06-27 14:18 ` Krzysztof Kozlowski
1 sibling, 0 replies; 11+ messages in thread
From: Krzysztof Kozlowski @ 2024-06-27 14:18 UTC (permalink / raw)
To: Neil Armstrong, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, devicetree, linux-kernel
On 27/06/2024 14:57, Neil Armstrong wrote:
> Add appropriate mappings of Soundwire ports of WSA8845 speaker
> to correctly map the Speaker ports to the WSA macro ports.
>
> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 3/3] arm64: dts: qcom: sm8650-qrd: add port mapping to speakers
2024-06-27 12:57 [PATCH 0/3] arm64: qcom: sm8650: add port mapping to speakers Neil Armstrong
2024-06-27 12:57 ` [PATCH 1/3] arm64: dts: qcom: sm8650-hdk: " Neil Armstrong
2024-06-27 12:57 ` [PATCH 2/3] arm64: dts: qcom: sm8650-mtp: " Neil Armstrong
@ 2024-06-27 12:57 ` Neil Armstrong
2024-06-27 13:40 ` Konrad Dybcio
2024-06-27 14:18 ` Krzysztof Kozlowski
2024-07-03 3:37 ` [PATCH 0/3] arm64: qcom: sm8650: " Bjorn Andersson
3 siblings, 2 replies; 11+ messages in thread
From: Neil Armstrong @ 2024-06-27 12:57 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley
Cc: linux-arm-msm, devicetree, linux-kernel, Neil Armstrong
Add appropriate mappings of Soundwire ports of WSA8845 speaker
to correctly map the Speaker ports to the WSA macro ports.
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
---
arch/arm64/boot/dts/qcom/sm8650-qrd.dts | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/sm8650-qrd.dts b/arch/arm64/boot/dts/qcom/sm8650-qrd.dts
index 6e3c4d8dcc19..b0d7927b708f 100644
--- a/arch/arm64/boot/dts/qcom/sm8650-qrd.dts
+++ b/arch/arm64/boot/dts/qcom/sm8650-qrd.dts
@@ -1089,6 +1089,16 @@ left_spkr: speaker@0,0 {
sound-name-prefix = "SpkrLeft";
vdd-1p8-supply = <&vreg_l15b_1p8>;
vdd-io-supply = <&vreg_l3c_1p2>;
+
+ /*
+ * WSA8845 Port 1 (DAC) <=> SWR0 Port 1 (SPKR_L)
+ * WSA8845 Port 2 (COMP) <=> SWR0 Port 2 (SPKR_L_COMP)
+ * WSA8845 Port 3 (BOOST) <=> SWR0 Port 3 (SPKR_L_BOOST)
+ * WSA8845 Port 4 (PBR) <=> SWR0 Port 7 (PBR)
+ * WSA8845 Port 5 (VISENSE) <=> SWR0 Port 10 (SPKR_L_VI)
+ * WSA8845 Port 6 (CPS) <=> SWR0 Port 13 (CPS)
+ */
+ qcom,port-mapping = <1 2 3 7 10 13>;
};
/* WSA8845, Speaker Right */
@@ -1102,6 +1112,16 @@ right_spkr: speaker@0,1 {
sound-name-prefix = "SpkrRight";
vdd-1p8-supply = <&vreg_l15b_1p8>;
vdd-io-supply = <&vreg_l3c_1p2>;
+
+ /*
+ * WSA8845 Port 1 (DAC) <=> SWR0 Port 4 (SPKR_R)
+ * WSA8845 Port 2 (COMP) <=> SWR0 Port 5 (SPKR_R_COMP)
+ * WSA8845 Port 3 (BOOST) <=> SWR0 Port 6 (SPKR_R_BOOST)
+ * WSA8845 Port 4 (PBR) <=> SWR0 Port 7 (PBR)
+ * WSA8845 Port 5 (VISENSE) <=> SWR0 Port 11 (SPKR_R_VI)
+ * WSA8845 Port 6 (CPS) <=> SWR0 Port 13 (CPS)
+ */
+ qcom,port-mapping = <4 5 6 7 11 13>;
};
};
--
2.34.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH 3/3] arm64: dts: qcom: sm8650-qrd: add port mapping to speakers
2024-06-27 12:57 ` [PATCH 3/3] arm64: dts: qcom: sm8650-qrd: " Neil Armstrong
@ 2024-06-27 13:40 ` Konrad Dybcio
2024-06-27 14:18 ` Krzysztof Kozlowski
1 sibling, 0 replies; 11+ messages in thread
From: Konrad Dybcio @ 2024-06-27 13:40 UTC (permalink / raw)
To: Neil Armstrong, Bjorn Andersson, Rob Herring, Krzysztof Kozlowski,
Conor Dooley
Cc: linux-arm-msm, devicetree, linux-kernel
On 27.06.2024 2:57 PM, Neil Armstrong wrote:
> Add appropriate mappings of Soundwire ports of WSA8845 speaker
> to correctly map the Speaker ports to the WSA macro ports.
>
> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Konrad
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 3/3] arm64: dts: qcom: sm8650-qrd: add port mapping to speakers
2024-06-27 12:57 ` [PATCH 3/3] arm64: dts: qcom: sm8650-qrd: " Neil Armstrong
2024-06-27 13:40 ` Konrad Dybcio
@ 2024-06-27 14:18 ` Krzysztof Kozlowski
1 sibling, 0 replies; 11+ messages in thread
From: Krzysztof Kozlowski @ 2024-06-27 14:18 UTC (permalink / raw)
To: Neil Armstrong, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, devicetree, linux-kernel
On 27/06/2024 14:57, Neil Armstrong wrote:
> Add appropriate mappings of Soundwire ports of WSA8845 speaker
> to correctly map the Speaker ports to the WSA macro ports.
>
> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
> ---
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 0/3] arm64: qcom: sm8650: add port mapping to speakers
2024-06-27 12:57 [PATCH 0/3] arm64: qcom: sm8650: add port mapping to speakers Neil Armstrong
` (2 preceding siblings ...)
2024-06-27 12:57 ` [PATCH 3/3] arm64: dts: qcom: sm8650-qrd: " Neil Armstrong
@ 2024-07-03 3:37 ` Bjorn Andersson
3 siblings, 0 replies; 11+ messages in thread
From: Bjorn Andersson @ 2024-07-03 3:37 UTC (permalink / raw)
To: Konrad Dybcio, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Neil Armstrong
Cc: linux-arm-msm, devicetree, linux-kernel
On Thu, 27 Jun 2024 14:57:13 +0200, Neil Armstrong wrote:
> Add appropriate mappings of Soundwire ports of WSA8845 speaker
> on MTP, QRD and HDK boards to correctly map the speaker ports to
> the corresponding WSA macro ports.
>
> Runtime Dependencies:
> - https://lore.kernel.org/all/20240625-qcom-audio-wsa-second-speaker-v1-0-f65ffdfc368c@linaro.org/
> - https://lore.kernel.org/all/20240626-port-map-v1-2-bd8987d2b332@linaro.org/
> - https://lore.kernel.org/all/20240626-port-map-v1-4-bd8987d2b332@linaro.org/
>
> [...]
Applied, thanks!
[1/3] arm64: dts: qcom: sm8650-hdk: add port mapping to speakers
commit: 1cda6acb8fbd9c1050737d50a60c0b91b8c64dfb
[2/3] arm64: dts: qcom: sm8650-mtp: add port mapping to speakers
commit: f3b84707c41fe1c2ca41588278ac1845d15a5006
[3/3] arm64: dts: qcom: sm8650-qrd: add port mapping to speakers
commit: 519df670e8921d0f9bea2be1049ad601742d749d
Best regards,
--
Bjorn Andersson <andersson@kernel.org>
^ permalink raw reply [flat|nested] 11+ messages in thread