| Message ID | 20250319143613.11177-1-srinivas.kandagatla@linaro.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | arm64: dts: qcom: x1e80100-tuxedo-14: add sound support | expand |
Hi Srini, On Wed, 19 Mar 2025 at 14:43, <srinivas.kandagatla@linaro.org> wrote: > > From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > > This patch adds sound support for this platform, > support includes > - 2x Speakers. > - 2x dmic > - Headset > > Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > --- > > This patch depends on > "arm64: dts: qcom: Add device tree for TUXEDO Elite 14 Gen1" patch > https://lkml.org/lkml/2025/3/6/867 > > ucm changes: > https://github.com/Srinivas-Kandagatla/alsa-ucm-conf/tree/x1e80100-tuxedo > > tplg changes: > https://github.com/Srinivas-Kandagatla/audioreach-topology/tree/tuxedo-elite-14 I think it'd be nice to create merge requests for these and include those links in the cover letter, what do you think? > > .../qcom/x1e80100-tuxedo-elite-14-gen1.dts | 190 ++++++++++++++++++ > 1 file changed, 190 insertions(+) > > diff --git a/arch/arm64/boot/dts/qcom/x1e80100-tuxedo-elite-14-gen1.dts b/arch/arm64/boot/dts/qcom/x1e80100-tuxedo-elite-14-gen1.dts > index 86bdec4a2dd8..465221b8a3fa 100644 > --- a/arch/arm64/boot/dts/qcom/x1e80100-tuxedo-elite-14-gen1.dts > +++ b/arch/arm64/boot/dts/qcom/x1e80100-tuxedo-elite-14-gen1.dts > @@ -20,6 +20,34 @@ aliases { > serial0 = &uart21; > }; > > + There's an additional new line here ? > + wcd938x: audio-codec { > + compatible = "qcom,wcd9385-codec"; > + > + pinctrl-0 = <&wcd_default>; > + pinctrl-names = "default"; > + > + qcom,micbias1-microvolt = <1800000>; > + qcom,micbias2-microvolt = <1800000>; > + qcom,micbias3-microvolt = <1800000>; > + qcom,micbias4-microvolt = <1800000>; > + qcom,mbhc-buttons-vthreshold-microvolt = <75000 150000 237000 500000 500000 500000 500000 500000>; > + qcom,mbhc-headset-vthreshold-microvolt = <1700000>; > + qcom,mbhc-headphone-vthreshold-microvolt = <50000>; > + qcom,rx-device = <&wcd_rx>; > + qcom,tx-device = <&wcd_tx>; > + > + reset-gpios = <&tlmm 191 GPIO_ACTIVE_LOW>; > + > + vdd-buck-supply = <&vreg_l15b_1p8>; > + vdd-rxtx-supply = <&vreg_l15b_1p8>; > + vdd-io-supply = <&vreg_l15b_1p8>; > + vdd-mic-bias-supply = <&vreg_bob1>; > + > + > + #sound-dai-cells = <1>; > + }; > + > chosen { > stdout-path = "serial0:115200n8"; > }; > @@ -129,6 +157,85 @@ vph_pwr: regulator-vph-pwr { > regulator-always-on; > regulator-boot-on; > }; > + > + sound { > + compatible = "qcom,x1e80100-sndcard"; > + model = "X1E80100-TUXEDO-Elite-14"; > + audio-routing = "SpkrLeft IN", "WSA WSA_SPK1 OUT", > + "SpkrRight IN", "WSA WSA_SPK2 OUT", > + "IN1_HPHL", "HPHL_OUT", > + "IN2_HPHR", "HPHR_OUT", > + "AMIC2", "MIC BIAS2", > + "VA DMIC0", "MIC BIAS1", > + "VA DMIC1", "MIC BIAS1", > + "VA DMIC0", "VA MIC BIAS1", > + "VA DMIC1", "VA MIC BIAS1", > + "TX SWR_INPUT1", "ADC2_OUTPUT"; > + > + wcd-playback-dai-link { > + link-name = "WCD Playback"; > + > + cpu { > + sound-dai = <&q6apmbedai RX_CODEC_DMA_RX_0>; > + }; > + > + codec { > + sound-dai = <&wcd938x 0>, <&swr1 0>, <&lpass_rxmacro 0>; > + }; > + > + platform { > + sound-dai = <&q6apm>; > + }; > + }; > + > + wcd-capture-dai-link { > + link-name = "WCD Capture"; > + > + cpu { > + sound-dai = <&q6apmbedai TX_CODEC_DMA_TX_3>; > + }; > + > + codec { > + sound-dai = <&wcd938x 1>, <&swr2 1>, <&lpass_txmacro 0>; > + }; > + > + platform { > + sound-dai = <&q6apm>; > + }; > + }; > + > + wsa-dai-link { > + link-name = "WSA Playback"; > + > + cpu { > + sound-dai = <&q6apmbedai WSA_CODEC_DMA_RX_0>; > + }; > + > + codec { > + sound-dai = <&left_spkr>, <&right_spkr>, <&swr0 0>, <&lpass_wsamacro 0>; > + }; > + > + platform { > + sound-dai = <&q6apm>; > + }; > + }; > + > + va-dai-link { > + link-name = "VA Capture"; > + > + cpu { > + sound-dai = <&q6apmbedai VA_CODEC_DMA_TX_0>; > + }; > + > + codec { > + sound-dai = <&lpass_vamacro 0>; > + }; > + > + platform { > + sound-dai = <&q6apm>; > + }; > + }; > + }; > }; > > &apps_rsc { > @@ -160,6 +267,13 @@ vreg_bob2: bob2 { > regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; > }; > > + vreg_l1b_1p8: ldo1 { > + regulator-name = "vreg_l1b_1p8"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <1800000>; > + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; > + }; > + > vreg_l2b_3p0: ldo2 { > regulator-name = "vreg_l2b_3p0"; > regulator-min-microvolt = <3072000>; > @@ -534,6 +648,24 @@ eusb6_repeater: redriver@4f { > > }; > > +&lpass_tlmm { > + spkr_01_sd_n_active: spkr-01-sd-n-active-state { > + pins = "gpio12"; > + function = "gpio"; > + drive-strength = <16>; > + bias-disable; > + output-low; > + }; > +}; > + > +&lpass_vamacro { > + pinctrl-0 = <&dmic01_default>; > + pinctrl-names = "default"; > + > + vdd-micb-supply = <&vreg_l1b_1p8>; > + qcom,dmic-sample-rate = <4800000>; > +}; > + > &mdss { > status = "okay"; > }; > @@ -648,6 +780,64 @@ &smb2360_1 { > status = "okay"; > }; > > +&smb2360_1_eusb2_repeater { > + vdd18-supply = <&vreg_l3d_1p8>; > + vdd3-supply = <&vreg_l14b_3p0>; > +}; > + > +&swr0 { > + status = "okay"; > + > + pinctrl-0 = <&wsa_swr_active>, <&spkr_01_sd_n_active>; > + pinctrl-names = "default"; > + > + /* WSA8845, Left Speaker */ > + left_spkr: speaker@0,0 { > + compatible = "sdw20217020400"; > + reg = <0 0>; > + reset-gpios = <&lpass_tlmm 12 GPIO_ACTIVE_LOW>; > + #sound-dai-cells = <0>; > + sound-name-prefix = "SpkrLeft"; > + vdd-1p8-supply = <&vreg_l15b_1p8>; > + vdd-io-supply = <&vreg_l12b_1p2>; > + qcom,port-mapping = <1 2 3 7 10 13>; > + }; > + > + /* WSA8845, Right Speaker */ > + right_spkr: speaker@0,1 { > + compatible = "sdw20217020400"; > + reg = <0 1>; > + reset-gpios = <&lpass_tlmm 12 GPIO_ACTIVE_LOW>; > + #sound-dai-cells = <0>; > + sound-name-prefix = "SpkrRight"; > + vdd-1p8-supply = <&vreg_l15b_1p8>; > + vdd-io-supply = <&vreg_l12b_1p2>; > + qcom,port-mapping = <4 5 6 7 11 13>; > + }; > +}; > + > +&swr1 { > + status = "okay"; > + > + /* WCD9385 RX */ > + wcd_rx: codec@0,4 { > + compatible = "sdw20217010d00"; > + reg = <0 4>; > + qcom,rx-port-mapping = <1 2 3 4 5>; > + }; > +}; > + > +&swr2 { > + status = "okay"; > + > + /* WCD9385 TX */ > + wcd_tx: codec@0,3 { > + compatible = "sdw20217010d00"; > + reg = <0 3>; > + qcom,tx-port-mapping = <2 2 3 4>; > + }; > +}; > + > &tlmm { > gpio-reserved-ranges = <28 4>, /* Unused */ > <44 4>, /* SPI (TPM) */ > -- > 2.39.5 > >
> From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > > This patch adds sound support for this platform, > support includes > - 2x Speakers. > - 2x dmic > - Headset > > Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > --- > > This patch depends on > "arm64: dts: qcom: Add device tree for TUXEDO Elite 14 Gen1" patch > https://lkml.org/lkml/2025/3/6/867 > > ucm changes: > https://github.com/Srinivas-Kandagatla/alsa-ucm-conf/tree/x1e80100-tuxedo > > tplg changes: > https://github.com/Srinivas-Kandagatla/audioreach-topology/tree/tuxedo-elite-14 > > .../qcom/x1e80100-tuxedo-elite-14-gen1.dts | 190 ++++++++++++++++++ > 1 file changed, 190 insertions(+) <snip> > +&smb2360_1_eusb2_repeater { > + vdd18-supply = <&vreg_l3d_1p8>; > + vdd3-supply = <&vreg_l14b_3p0>; > +}; This seems like it should be part of a different patch? Or should be mentioned in the commit message. > +&swr0 { > + status = "okay"; > + > + pinctrl-0 = <&wsa_swr_active>, <&spkr_01_sd_n_active>; > + pinctrl-names = "default"; > + > + /* WSA8845, Left Speaker */ > + left_spkr: speaker@0,0 { > + compatible = "sdw20217020400"; > + reg = <0 0>; > + reset-gpios = <&lpass_tlmm 12 GPIO_ACTIVE_LOW>; > + #sound-dai-cells = <0>; > + sound-name-prefix = "SpkrLeft"; > + vdd-1p8-supply = <&vreg_l15b_1p8>; > + vdd-io-supply = <&vreg_l12b_1p2>; > + qcom,port-mapping = <1 2 3 7 10 13>; > + }; > + > + /* WSA8845, Right Speaker */ > + right_spkr: speaker@0,1 { > + compatible = "sdw20217020400"; > + reg = <0 1>; > + reset-gpios = <&lpass_tlmm 12 GPIO_ACTIVE_LOW>; > + #sound-dai-cells = <0>; > + sound-name-prefix = "SpkrRight"; > + vdd-1p8-supply = <&vreg_l15b_1p8>; > + vdd-io-supply = <&vreg_l12b_1p2>; > + qcom,port-mapping = <4 5 6 7 11 13>; > + }; > +}; > + > +&swr1 { > + status = "okay"; > + > + /* WCD9385 RX */ > + wcd_rx: codec@0,4 { > + compatible = "sdw20217010d00"; > + reg = <0 4>; > + qcom,rx-port-mapping = <1 2 3 4 5>; > + }; > +}; > + > +&swr2 { > + status = "okay"; > + > + /* WCD9385 TX */ > + wcd_tx: codec@0,3 { > + compatible = "sdw20217010d00"; > + reg = <0 3>; > + qcom,tx-port-mapping = <2 2 3 4>; > + }; > +}; > + > &tlmm { > gpio-reserved-ranges = <28 4>, /* Unused */ > <44 4>, /* SPI (TPM) */ > -- > 2.39.5 Kind regards, Maud Spierings
On 19/03/2025 15:36, srinivas.kandagatla@linaro.org wrote: > From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > > This patch adds sound support for this platform, > support includes > - 2x Speakers. > - 2x dmic > - Headset > > Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > --- > > This patch depends on > "arm64: dts: qcom: Add device tree for TUXEDO Elite 14 Gen1" patch > https://lkml.org/lkml/2025/3/6/867 > > ucm changes: > https://github.com/Srinivas-Kandagatla/alsa-ucm-conf/tree/x1e80100-tuxedo > > tplg changes: > https://github.com/Srinivas-Kandagatla/audioreach-topology/tree/tuxedo-elite-14 > > .../qcom/x1e80100-tuxedo-elite-14-gen1.dts | 190 ++++++++++++++++++ > 1 file changed, 190 insertions(+) > > diff --git a/arch/arm64/boot/dts/qcom/x1e80100-tuxedo-elite-14-gen1.dts b/arch/arm64/boot/dts/qcom/x1e80100-tuxedo-elite-14-gen1.dts > index 86bdec4a2dd8..465221b8a3fa 100644 > --- a/arch/arm64/boot/dts/qcom/x1e80100-tuxedo-elite-14-gen1.dts > +++ b/arch/arm64/boot/dts/qcom/x1e80100-tuxedo-elite-14-gen1.dts > @@ -20,6 +20,34 @@ aliases { > serial0 = &uart21; > }; > > + No need for blank line > + wcd938x: audio-codec { > + compatible = "qcom,wcd9385-codec"; > + > + pinctrl-0 = <&wcd_default>; > + pinctrl-names = "default"; > + > + qcom,micbias1-microvolt = <1800000>; > + qcom,micbias2-microvolt = <1800000>; > + qcom,micbias3-microvolt = <1800000>; > + qcom,micbias4-microvolt = <1800000>; > + qcom,mbhc-buttons-vthreshold-microvolt = <75000 150000 237000 500000 500000 500000 500000 500000>; > + qcom,mbhc-headset-vthreshold-microvolt = <1700000>; > + qcom,mbhc-headphone-vthreshold-microvolt = <50000>; > + qcom,rx-device = <&wcd_rx>; > + qcom,tx-device = <&wcd_tx>; > + > + reset-gpios = <&tlmm 191 GPIO_ACTIVE_LOW>; > + > + vdd-buck-supply = <&vreg_l15b_1p8>; > + vdd-rxtx-supply = <&vreg_l15b_1p8>; > + vdd-io-supply = <&vreg_l15b_1p8>; > + vdd-mic-bias-supply = <&vreg_bob1>; > + > + Here only one as well > + #sound-dai-cells = <1>; > + }; > + ... > +&swr0 { > + status = "okay"; > + > + pinctrl-0 = <&wsa_swr_active>, <&spkr_01_sd_n_active>; > + pinctrl-names = "default"; > + > + /* WSA8845, Left Speaker */ > + left_spkr: speaker@0,0 { > + compatible = "sdw20217020400"; > + reg = <0 0>; > + reset-gpios = <&lpass_tlmm 12 GPIO_ACTIVE_LOW>; Interesting that on X1E even two-speaker configurations share the reset GPIO. Typical two-speaker setups like MTP and QRD use two different GPIOs. Assuming this is not a copy-paste and with blank line fixes: Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Best regards, Krzysztof
On 20/03/2025 07:13, Maud Spierings wrote: >> From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> >> >> This patch adds sound support for this platform, >> support includes >> - 2x Speakers. >> - 2x dmic >> - Headset >> >> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> >> --- >> >> This patch depends on >> "arm64: dts: qcom: Add device tree for TUXEDO Elite 14 Gen1" patch >> https://lkml.org/lkml/2025/3/6/867 >> >> ucm changes: >> https://github.com/Srinivas-Kandagatla/alsa-ucm-conf/tree/x1e80100-tuxedo >> >> tplg changes: >> https://github.com/Srinivas-Kandagatla/audioreach-topology/tree/tuxedo-elite-14 >> >> .../qcom/x1e80100-tuxedo-elite-14-gen1.dts | 190 ++++++++++++++++++ >> 1 file changed, 190 insertions(+) > > <snip> > >> +&smb2360_1_eusb2_repeater { >> + vdd18-supply = <&vreg_l3d_1p8>; >> + vdd3-supply = <&vreg_l14b_3p0>; >> +}; > > This seems like it should be part of a different patch? Or should be > mentioned in the commit message. > True, i thought I got rid of this before sending. Thanks for spotting, will fix in next version. --srini >> +&swr0 { >> + status = "okay"; >> + >> + pinctrl-0 = <&wsa_swr_active>, <&spkr_01_sd_n_active>; >> + pinctrl-names = "default"; >> + >> + /* WSA8845, Left Speaker */ >> + left_spkr: speaker@0,0 { >> + compatible = "sdw20217020400"; >> + reg = <0 0>; >> + reset-gpios = <&lpass_tlmm 12 GPIO_ACTIVE_LOW>; >> + #sound-dai-cells = <0>; >> + sound-name-prefix = "SpkrLeft"; >> + vdd-1p8-supply = <&vreg_l15b_1p8>; >> + vdd-io-supply = <&vreg_l12b_1p2>; >> + qcom,port-mapping = <1 2 3 7 10 13>; >> + }; >> + >> + /* WSA8845, Right Speaker */ >> + right_spkr: speaker@0,1 { >> + compatible = "sdw20217020400"; >> + reg = <0 1>; >> + reset-gpios = <&lpass_tlmm 12 GPIO_ACTIVE_LOW>; >> + #sound-dai-cells = <0>; >> + sound-name-prefix = "SpkrRight"; >> + vdd-1p8-supply = <&vreg_l15b_1p8>; >> + vdd-io-supply = <&vreg_l12b_1p2>; >> + qcom,port-mapping = <4 5 6 7 11 13>; >> + }; >> +}; >> + >> +&swr1 { >> + status = "okay"; >> + >> + /* WCD9385 RX */ >> + wcd_rx: codec@0,4 { >> + compatible = "sdw20217010d00"; >> + reg = <0 4>; >> + qcom,rx-port-mapping = <1 2 3 4 5>; >> + }; >> +}; >> + >> +&swr2 { >> + status = "okay"; >> + >> + /* WCD9385 TX */ >> + wcd_tx: codec@0,3 { >> + compatible = "sdw20217010d00"; >> + reg = <0 3>; >> + qcom,tx-port-mapping = <2 2 3 4>; >> + }; >> +}; >> + >> &tlmm { >> gpio-reserved-ranges = <28 4>, /* Unused */ >> <44 4>, /* SPI (TPM) */ >> -- >> 2.39.5 > > Kind regards, > Maud Spierings
diff --git a/arch/arm64/boot/dts/qcom/x1e80100-tuxedo-elite-14-gen1.dts b/arch/arm64/boot/dts/qcom/x1e80100-tuxedo-elite-14-gen1.dts index 86bdec4a2dd8..465221b8a3fa 100644 --- a/arch/arm64/boot/dts/qcom/x1e80100-tuxedo-elite-14-gen1.dts +++ b/arch/arm64/boot/dts/qcom/x1e80100-tuxedo-elite-14-gen1.dts @@ -20,6 +20,34 @@ aliases { serial0 = &uart21; }; + + wcd938x: audio-codec { + compatible = "qcom,wcd9385-codec"; + + pinctrl-0 = <&wcd_default>; + pinctrl-names = "default"; + + qcom,micbias1-microvolt = <1800000>; + qcom,micbias2-microvolt = <1800000>; + qcom,micbias3-microvolt = <1800000>; + qcom,micbias4-microvolt = <1800000>; + qcom,mbhc-buttons-vthreshold-microvolt = <75000 150000 237000 500000 500000 500000 500000 500000>; + qcom,mbhc-headset-vthreshold-microvolt = <1700000>; + qcom,mbhc-headphone-vthreshold-microvolt = <50000>; + qcom,rx-device = <&wcd_rx>; + qcom,tx-device = <&wcd_tx>; + + reset-gpios = <&tlmm 191 GPIO_ACTIVE_LOW>; + + vdd-buck-supply = <&vreg_l15b_1p8>; + vdd-rxtx-supply = <&vreg_l15b_1p8>; + vdd-io-supply = <&vreg_l15b_1p8>; + vdd-mic-bias-supply = <&vreg_bob1>; + + + #sound-dai-cells = <1>; + }; + chosen { stdout-path = "serial0:115200n8"; }; @@ -129,6 +157,85 @@ vph_pwr: regulator-vph-pwr { regulator-always-on; regulator-boot-on; }; + + sound { + compatible = "qcom,x1e80100-sndcard"; + model = "X1E80100-TUXEDO-Elite-14"; + audio-routing = "SpkrLeft IN", "WSA WSA_SPK1 OUT", + "SpkrRight IN", "WSA WSA_SPK2 OUT", + "IN1_HPHL", "HPHL_OUT", + "IN2_HPHR", "HPHR_OUT", + "AMIC2", "MIC BIAS2", + "VA DMIC0", "MIC BIAS1", + "VA DMIC1", "MIC BIAS1", + "VA DMIC0", "VA MIC BIAS1", + "VA DMIC1", "VA MIC BIAS1", + "TX SWR_INPUT1", "ADC2_OUTPUT"; + + wcd-playback-dai-link { + link-name = "WCD Playback"; + + cpu { + sound-dai = <&q6apmbedai RX_CODEC_DMA_RX_0>; + }; + + codec { + sound-dai = <&wcd938x 0>, <&swr1 0>, <&lpass_rxmacro 0>; + }; + + platform { + sound-dai = <&q6apm>; + }; + }; + + wcd-capture-dai-link { + link-name = "WCD Capture"; + + cpu { + sound-dai = <&q6apmbedai TX_CODEC_DMA_TX_3>; + }; + + codec { + sound-dai = <&wcd938x 1>, <&swr2 1>, <&lpass_txmacro 0>; + }; + + platform { + sound-dai = <&q6apm>; + }; + }; + + wsa-dai-link { + link-name = "WSA Playback"; + + cpu { + sound-dai = <&q6apmbedai WSA_CODEC_DMA_RX_0>; + }; + + codec { + sound-dai = <&left_spkr>, <&right_spkr>, <&swr0 0>, <&lpass_wsamacro 0>; + }; + + platform { + sound-dai = <&q6apm>; + }; + }; + + va-dai-link { + link-name = "VA Capture"; + + cpu { + sound-dai = <&q6apmbedai VA_CODEC_DMA_TX_0>; + }; + + codec { + sound-dai = <&lpass_vamacro 0>; + }; + + platform { + sound-dai = <&q6apm>; + }; + }; + }; }; &apps_rsc { @@ -160,6 +267,13 @@ vreg_bob2: bob2 { regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; }; + vreg_l1b_1p8: ldo1 { + regulator-name = "vreg_l1b_1p8"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; + }; + vreg_l2b_3p0: ldo2 { regulator-name = "vreg_l2b_3p0"; regulator-min-microvolt = <3072000>; @@ -534,6 +648,24 @@ eusb6_repeater: redriver@4f { }; +&lpass_tlmm { + spkr_01_sd_n_active: spkr-01-sd-n-active-state { + pins = "gpio12"; + function = "gpio"; + drive-strength = <16>; + bias-disable; + output-low; + }; +}; + +&lpass_vamacro { + pinctrl-0 = <&dmic01_default>; + pinctrl-names = "default"; + + vdd-micb-supply = <&vreg_l1b_1p8>; + qcom,dmic-sample-rate = <4800000>; +}; + &mdss { status = "okay"; }; @@ -648,6 +780,64 @@ &smb2360_1 { status = "okay"; }; +&smb2360_1_eusb2_repeater { + vdd18-supply = <&vreg_l3d_1p8>; + vdd3-supply = <&vreg_l14b_3p0>; +}; + +&swr0 { + status = "okay"; + + pinctrl-0 = <&wsa_swr_active>, <&spkr_01_sd_n_active>; + pinctrl-names = "default"; + + /* WSA8845, Left Speaker */ + left_spkr: speaker@0,0 { + compatible = "sdw20217020400"; + reg = <0 0>; + reset-gpios = <&lpass_tlmm 12 GPIO_ACTIVE_LOW>; + #sound-dai-cells = <0>; + sound-name-prefix = "SpkrLeft"; + vdd-1p8-supply = <&vreg_l15b_1p8>; + vdd-io-supply = <&vreg_l12b_1p2>; + qcom,port-mapping = <1 2 3 7 10 13>; + }; + + /* WSA8845, Right Speaker */ + right_spkr: speaker@0,1 { + compatible = "sdw20217020400"; + reg = <0 1>; + reset-gpios = <&lpass_tlmm 12 GPIO_ACTIVE_LOW>; + #sound-dai-cells = <0>; + sound-name-prefix = "SpkrRight"; + vdd-1p8-supply = <&vreg_l15b_1p8>; + vdd-io-supply = <&vreg_l12b_1p2>; + qcom,port-mapping = <4 5 6 7 11 13>; + }; +}; + +&swr1 { + status = "okay"; + + /* WCD9385 RX */ + wcd_rx: codec@0,4 { + compatible = "sdw20217010d00"; + reg = <0 4>; + qcom,rx-port-mapping = <1 2 3 4 5>; + }; +}; + +&swr2 { + status = "okay"; + + /* WCD9385 TX */ + wcd_tx: codec@0,3 { + compatible = "sdw20217010d00"; + reg = <0 3>; + qcom,tx-port-mapping = <2 2 3 4>; + }; +}; + &tlmm { gpio-reserved-ranges = <28 4>, /* Unused */ <44 4>, /* SPI (TPM) */