arm64: dts: qcom: sm8750-mtp: Add speaker Soundwire port mapping

[PATCH] arm64: dts: qcom: sm8750-mtp: Add speaker Soundwire port mapping

Posted by Krzysztof Kozlowski 5 months, 2 weeks ago

Add appropriate mappings of Soundwire ports of WSA883x speaker
to correctly map the Speaker ports to the WSA macro ports.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 arch/arm64/boot/dts/qcom/sm8750-mtp.dts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sm8750-mtp.dts b/arch/arm64/boot/dts/qcom/sm8750-mtp.dts
index 75cfbb510be5..946ba53fe63a 100644
--- a/arch/arm64/boot/dts/qcom/sm8750-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sm8750-mtp.dts
@@ -938,6 +938,13 @@ left_spkr: speaker@0,1 {
 		sound-name-prefix = "SpkrLeft";
 		#thermal-sensor-cells = <0>;
 		vdd-supply = <&vreg_l15b_1p8>;
+		/*
+		 * WSA8835 Port 1 (DAC)     <=> SWR0 Port 1 (SPKR_L)
+		 * WSA8835 Port 2 (COMP)    <=> SWR0 Port 2 (SPKR_L_COMP)
+		 * WSA8835 Port 3 (BOOST)   <=> SWR0 Port 3 (SPKR_L_BOOST)
+		 * WSA8835 Port 4 (VISENSE) <=> SWR0 Port 10 (SPKR_L_VI)
+		 */
+		qcom,port-mapping = <1 2 3 10>;
 	};
 
 	/* WSA883x, right/back speaker */
@@ -951,6 +958,13 @@ right_spkr: speaker@0,2 {
 		sound-name-prefix = "SpkrRight";
 		#thermal-sensor-cells = <0>;
 		vdd-supply = <&vreg_l15b_1p8>;
+		/*
+		 * WSA8835 Port 1 (DAC)     <=> SWR0 Port 4 (SPKR_R)
+		 * WSA8835 Port 2 (COMP)    <=> SWR0 Port 5 (SPKR_R_COMP)
+		 * WSA8835 Port 3 (BOOST)   <=> SWR0 Port 6 (SPKR_R_BOOST)
+		 * WSA8835 Port 4 (VISENSE) <=> SWR0 Port 11 (SPKR_R_VI)
+		 */
+		qcom,port-mapping = <4 5 6 11>;
 	};
 };
 
-- 
2.48.1

Re: [PATCH] arm64: dts: qcom: sm8750-mtp: Add speaker Soundwire port mapping

Posted by Bjorn Andersson 5 months, 2 weeks ago

On Wed, 20 Aug 2025 16:12:34 +0200, Krzysztof Kozlowski wrote:
> Add appropriate mappings of Soundwire ports of WSA883x speaker
> to correctly map the Speaker ports to the WSA macro ports.
> 
> 

Applied, thanks!

[1/1] arm64: dts: qcom: sm8750-mtp: Add speaker Soundwire port mapping
      commit: 013632a410873d2ac538deb981780407917b2200

Best regards,
-- 
Bjorn Andersson <andersson@kernel.org>

Re: [PATCH] arm64: dts: qcom: sm8750-mtp: Add speaker Soundwire port mapping

Posted by Dmitry Baryshkov 5 months, 2 weeks ago

On Wed, Aug 20, 2025 at 04:12:34PM +0200, Krzysztof Kozlowski wrote:
> Add appropriate mappings of Soundwire ports of WSA883x speaker
> to correctly map the Speaker ports to the WSA macro ports.

Would it make sense to define constants for these values?

> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---
>  arch/arm64/boot/dts/qcom/sm8750-mtp.dts | 14 ++++++++++++++
>  1 file changed, 14 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sm8750-mtp.dts b/arch/arm64/boot/dts/qcom/sm8750-mtp.dts
> index 75cfbb510be5..946ba53fe63a 100644
> --- a/arch/arm64/boot/dts/qcom/sm8750-mtp.dts
> +++ b/arch/arm64/boot/dts/qcom/sm8750-mtp.dts
> @@ -938,6 +938,13 @@ left_spkr: speaker@0,1 {
>  		sound-name-prefix = "SpkrLeft";
>  		#thermal-sensor-cells = <0>;
>  		vdd-supply = <&vreg_l15b_1p8>;
> +		/*
> +		 * WSA8835 Port 1 (DAC)     <=> SWR0 Port 1 (SPKR_L)
> +		 * WSA8835 Port 2 (COMP)    <=> SWR0 Port 2 (SPKR_L_COMP)
> +		 * WSA8835 Port 3 (BOOST)   <=> SWR0 Port 3 (SPKR_L_BOOST)
> +		 * WSA8835 Port 4 (VISENSE) <=> SWR0 Port 10 (SPKR_L_VI)
> +		 */
> +		qcom,port-mapping = <1 2 3 10>;
>  	};
>  
>  	/* WSA883x, right/back speaker */
> @@ -951,6 +958,13 @@ right_spkr: speaker@0,2 {
>  		sound-name-prefix = "SpkrRight";
>  		#thermal-sensor-cells = <0>;
>  		vdd-supply = <&vreg_l15b_1p8>;
> +		/*
> +		 * WSA8835 Port 1 (DAC)     <=> SWR0 Port 4 (SPKR_R)
> +		 * WSA8835 Port 2 (COMP)    <=> SWR0 Port 5 (SPKR_R_COMP)
> +		 * WSA8835 Port 3 (BOOST)   <=> SWR0 Port 6 (SPKR_R_BOOST)
> +		 * WSA8835 Port 4 (VISENSE) <=> SWR0 Port 11 (SPKR_R_VI)
> +		 */
> +		qcom,port-mapping = <4 5 6 11>;
>  	};
>  };
>  
> -- 
> 2.48.1
> 

-- 
With best wishes
Dmitry

Re: [PATCH] arm64: dts: qcom: sm8750-mtp: Add speaker Soundwire port mapping

Posted by Krzysztof Kozlowski 5 months, 2 weeks ago

On 21/08/2025 12:37, Dmitry Baryshkov wrote:
> On Wed, Aug 20, 2025 at 04:12:34PM +0200, Krzysztof Kozlowski wrote:
>> Add appropriate mappings of Soundwire ports of WSA883x speaker
>> to correctly map the Speaker ports to the WSA macro ports.
> 
> Would it make sense to define constants for these values?


I am not aware of new findings here, so same answer as last time:
https://lore.kernel.org/all/dd271e8c-e430-4e6d-88ca-95eabe61ce94@oss.qualcomm.com/

Best regards,
Krzysztof