diff options
author | Srinivas Kandagatla <srinivas.kandagatla@linaro.org> | 2020-01-10 15:37:26 +0000 |
---|---|---|
committer | Amit Pundir <amit.pundir@linaro.org> | 2020-02-26 23:34:48 +0530 |
commit | 6df377d68a5b445e7bb1d76e6220b86904b5f9a3 (patch) | |
tree | 7a70f200c932af5a993e16f21efb2c64ed1cc02d | |
parent | 72272ad7aba405a74aac9b0f23e6dead7066a3ac (diff) |
fixup: dts: db845c: audio
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
-rw-r--r-- | arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 37 | ||||
-rw-r--r-- | arch/arm64/boot/dts/qcom/sdm845.dtsi | 46 |
2 files changed, 41 insertions, 42 deletions
diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts index 160f62a9dcbb..186c07590bcb 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts @@ -221,7 +221,6 @@ &slim_msm { ngd@1 { wcd9340: codec@1{ - //clock-names = "mclk", "slimbus"; clock-names = "extclk"; clocks = <&rpmhcc RPMH_LN_BB_CLK2>; vdd-buck-supply = <&vreg_s4a_1p8>; @@ -230,6 +229,25 @@ vdd-rx-supply = <&vreg_s4a_1p8>; vdd-io-supply = <&vreg_s4a_1p8>; + swm: swm@c85 { + left_spkr:wsa8810-left{ + compatible = "sdw10217201000"; + reg = <0 1>; + powerdown-gpios = <&wcdpinctrl 2 0>; + #thermal-sensor-cells = <0>; + sound-name-prefix = "SpkrLeft"; + #sound-dai-cells = <0>; + }; + + right_spkr:wsa8810-right{ + compatible = "sdw10217201000"; + powerdown-gpios = <&wcdpinctrl 2 0>; + reg = <0 2>; + #thermal-sensor-cells = <0>; + sound-name-prefix = "SpkrRight"; + #sound-dai-cells = <0>; + }; + }; }; }; }; @@ -486,17 +504,16 @@ audio-routing = "RX_BIAS", "MCLK", "AMIC1", "MIC BIAS1", - "MIC BIAS1", "Analog Mic1", + "AMIC2", "MIC BIAS2", "DMIC0", "MIC BIAS1", - "MIC BIAS1", "Digital Mic0", "DMIC1", "MIC BIAS1", - "MIC BIAS1", "Digital Mic1", "DMIC2", "MIC BIAS3", - "MIC BIAS1", "Digital Mic2", "DMIC3", "MIC BIAS3", - "MIC BIAS3", "Digital Mic3", "SpkrLeft IN", "SPK1 OUT", - "SpkrRight IN", "SPK2 OUT"; + "SpkrRight IN", "SPK2 OUT", + "MM_DL1", "MultiMedia1 Playback", + "MM_DL2", "MultiMedia2 Playback", + "MultiMedia3 Capture", "MM_UL3"; mm1-dai-link { link-name = "MultiMedia1"; @@ -533,6 +550,7 @@ sound-dai = <<9611_codec 0>; }; }; + slim-dai-link { link-name = "SLIM Playback"; cpu { @@ -544,7 +562,9 @@ }; codec { - sound-dai = <&wcd9340 0>, <&swm 0>; + sound-dai = <&left_spkr>, <&right_spkr>, <&swm 0>, <&wcd9340 0>; + //sound-dai = <&left_spkr>, <&right_spkr>, <&wcd9340 0>; + //sound-dai = <&swm 0>,<&wcd9340 0>, <&left_spkr>, <&right_spkr>; }; }; @@ -563,7 +583,6 @@ }; }; }; - &i2c10 { status = "okay"; clock-frequency = <400000>; diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi index 43f0368dc4ee..63a48986cc49 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -2850,19 +2850,12 @@ qcom,apps-ch-pipes = <0x780000>; qcom,ea-pc = <0x270>; - + status = "okay"; dmas = <&slimbam 3>, <&slimbam 4>, <&slimbam 5>, <&slimbam 6>; dma-names = "rx", "tx", "tx2", "rx2"; iommus = <&apps_smmu 0x1806 0x0>; -#if 0 - iommus = - <&apps_smmu 0x1806 0x0>, /* Audio SB NGD1 RX, TX */ - <&apps_smmu 0x180d 0x0>, /* data Pipe 11 reserved apps*/ - <&apps_smmu 0x180e 0x1>, /* audio SB data piple 12, 13 SVA*/ - <&apps_smmu 0x1810 0x1>; /* audio SB data pipe 14 2 ch rx */ -#endif #address-cells = <1>; #size-cells = <0>; ngd@1 { @@ -2877,7 +2870,7 @@ wcd9340: codec@1{ pinctrl-0 = <&wcd_intr_default>; - pinctrl-names = "default";//, "reset_active", "reset_sleep"; + pinctrl-names = "default"; compatible = "slim217,250"; reg = <1 0>; reset-gpios = <&tlmm 64 0>; @@ -2887,23 +2880,24 @@ interrupt-parent = <&tlmm>; interrupts = <54 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "intr1"; interrupt-controller; #interrupt-cells = <1>; #clock-cells = <0>; clock-frequency = <9600000>; clock-output-names = "mclk"; - qcom,micbias1-lvl = <1800>; - qcom,micbias2-lvl = <1800>; - qcom,micbias3-lvl = <1800>; - qcom,micbias4-lvl = <1800>; - + qcom,micbias1-millivolt = <1800>; + qcom,micbias2-millivolt = <1800>; + qcom,micbias3-millivolt = <1800>; + qcom,micbias4-millivolt = <1800>; + + #address-cells = <1>; + #size-cells = <1>; + wcdpinctrl: wcd-pinctrl@42 { - compatible = "qcom,wcd9340-pinctrl"; + compatible = "qcom,wcd9340-gpio"; gpio-controller; #gpio-cells = <2>; - gpio-ranges = <&wcdpinctrl 0 0 5>; reg = <0x42 0x2>; spkr_1_wcd_en_active: spkr_1_wcd_en_active { @@ -2969,8 +2963,6 @@ interrupt-parent = <&wcd9340>; interrupts = <20 IRQ_TYPE_EDGE_RISING>; interrupt-names = "soundwire"; - pinctrl-0 = <&spkr_1_wcd_en_active &spkr_2_wcd_en_active>; - pinctrl-names = "default"; qcom,dout-ports = <6>; qcom,din-ports = <2>; @@ -2981,21 +2973,9 @@ #sound-dai-cells = <1>; clocks = <&wcd9340>; clock-names = "iface"; + #address-cells = <2>; + #size-cells = <0>; - left_spkr:wsa8810-left{ - compatible = "sdw10,0217,2010,0"; - sdw-instance-id = <1>; - pd-gpios = <&wcdpinctrl 2 0>; - #thermal-sensor-cells = <0>; - - }; - - right_spkr:wsa8810-right{ - compatible = "sdw10,0217,2010,0"; - sdw-instance-id = <2>; - pd-gpios = <&wcdpinctrl 2 0>; - #thermal-sensor-cells = <0>; - }; }; }; |