| Message ID | 20240627-topic-sm8650-upstream-was-port-mapping-v1-1-4700bcc2489a@linaro.org (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | arm64: qcom: sm8650: add port mapping to speakers | expand |
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
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
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>; }; };
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(+)