diff options
| -rw-r--r-- | arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 19 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/qcom/sdm845.dtsi | 29 |
2 files changed, 30 insertions, 18 deletions
diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts index d990d5e928a90..31606eced080b 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts @@ -473,6 +473,12 @@ }; }; +/* MICBIAS1 for DMIC1 +MICBIAS2 to HP AMIC2 +MICBIAS3 for DMIC2/DMIC3 +MICBIAS4 for DMIC4/DMIC5 +*/ + &sound { compatible = "qcom,db845c-sndcard"; pinctrl-0 = <&quat_mi2s_active &quat_mi2s_sd0_active &quat_mi2s_sd1_active &quat_mi2s_sd2_active &quat_mi2s_sd3_active>; @@ -481,15 +487,16 @@ audio-routing = "RX_BIAS", "MCLK", "AMIC1", "MIC BIAS1", - "MIC BIAS1", "Analog Mic1", + "AMIC2", "MIC BIAS2", + // "MIC BIAS1", "Analog Mic1", "DMIC0", "MIC BIAS1", - "MIC BIAS1", "Digital Mic0", +// "MIC BIAS1", "Digital Mic0", "DMIC1", "MIC BIAS1", - "MIC BIAS1", "Digital Mic1", +// "MIC BIAS1", "Digital Mic1", "DMIC2", "MIC BIAS3", - "MIC BIAS1", "Digital Mic2", +// "MIC BIAS1", "Digital Mic2", "DMIC3", "MIC BIAS3", - "MIC BIAS3", "Digital Mic3", +// "MIC BIAS3", "Digital Mic3", "SpkrLeft IN", "SPK1 OUT", "SpkrRight IN", "SPK2 OUT"; @@ -539,7 +546,7 @@ }; codec { - sound-dai = <&wcd9340 0>, <&swm 0>; + sound-dai = <&left_spkr>, <&right_spkr>, <&swm 0>, <&wcd9340 0>; }; }; diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi index 0222f482b29df..4b91c1ebacab4 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -2894,11 +2894,11 @@ #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-mv = <1800>; + qcom,micbias2-mv = <1800>; + qcom,micbias3-mv = <1800>; + qcom,micbias4-mv = <1800>; + wcdpinctrl: wcd-pinctrl@42 { compatible = "qcom,wcd9340-pinctrl"; gpio-controller; @@ -2981,20 +2981,25 @@ #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>; + 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 = "sdw10,0217,2010,0"; - sdw-instance-id = <2>; - pd-gpios = <&wcdpinctrl 2 0>; + compatible = "sdw10217201000"; + powerdown-gpios = <&wcdpinctrl 2 0>; + reg = <0 2>; #thermal-sensor-cells = <0>; + sound-name-prefix = "SpkrRight"; + #sound-dai-cells = <0>; }; }; |