diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-31 04:42:28 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-31 04:42:27 -0800 |
| commit | ac0b19ff2ccbcb598042461303a6542ae79bcdba (patch) | |
| tree | c208b5e851e77f0ce6d1663e61dcb87f0b940b3c | |
| parent | 42e1251b38729f7d0ec276e8a195db1d3ed22d41 (diff) | |
| parent | ce6b9b73089ccb4cf2d2c26fe28dacf16255091e (diff) | |
Merge "ARM: dts: msm: modify sound node for sdm660 qrd skus"
| -rw-r--r-- | arch/arm/boot/dts/qcom/sdm660-qrd.dts | 22 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/sdm660-qrd.dtsi | 26 |
2 files changed, 26 insertions, 22 deletions
diff --git a/arch/arm/boot/dts/qcom/sdm660-qrd.dts b/arch/arm/boot/dts/qcom/sdm660-qrd.dts index 5d888c9d039f..9ad1bed8bbfa 100644 --- a/arch/arm/boot/dts/qcom/sdm660-qrd.dts +++ b/arch/arm/boot/dts/qcom/sdm660-qrd.dts @@ -64,25 +64,3 @@ &pm660l_wled { qcom,led-strings-list = [00 01]; }; - -&tasha_snd { - qcom,model = "sdm660-tasha-skus-snd-card"; - qcom,audio-routing = - "AIF4 VI", "MCLK", - "RX_BIAS", "MCLK", - "MADINPUT", "MCLK", - "AMIC2", "MIC BIAS2", - "MIC BIAS2", "Headset Mic", - "DMIC0", "MIC BIAS1", - "MIC BIAS1", "Digital Mic0", - "DMIC2", "MIC BIAS3", - "MIC BIAS3", "Digital Mic2", - "DMIC4", "MIC BIAS3", - "MIC BIAS3", "Digital Mic4", - "SpkrLeft IN", "SPK1 OUT"; - qcom,msm-mbhc-hphl-swh = <1>; - /delete-property/ qcom,us-euro-gpios; - qcom,wsa-max-devs = <1>; - qcom,wsa-devs = <&wsa881x_211>, <&wsa881x_213>; - qcom,wsa-aux-dev-prefix = "SpkrLeft", "SpkrLeft"; -}; diff --git a/arch/arm/boot/dts/qcom/sdm660-qrd.dtsi b/arch/arm/boot/dts/qcom/sdm660-qrd.dtsi index 57e547085cf9..635cc483426d 100644 --- a/arch/arm/boot/dts/qcom/sdm660-qrd.dtsi +++ b/arch/arm/boot/dts/qcom/sdm660-qrd.dtsi @@ -12,6 +12,7 @@ #include "sdm660-pinctrl.dtsi" #include "sdm660-camera-sensor-qrd.dtsi" +#include "sdm660-external-codec.dtsi" / { }; @@ -222,3 +223,28 @@ qcom,fg-jeita-thresholds = <0 5 55 55>; qcom,fg-cutoff-voltage = <3700>; }; + +&tasha_snd { + qcom,model = "sdm660-tasha-skus-snd-card"; + qcom,audio-routing = + "AIF4 VI", "MCLK", + "RX_BIAS", "MCLK", + "MADINPUT", "MCLK", + "AMIC2", "MIC BIAS2", + "MIC BIAS2", "Headset Mic", + "DMIC0", "MIC BIAS1", + "MIC BIAS1", "Digital Mic0", + "DMIC2", "MIC BIAS3", + "MIC BIAS3", "Digital Mic2", + "DMIC4", "MIC BIAS3", + "MIC BIAS3", "Digital Mic4", + "SpkrLeft IN", "SPK1 OUT"; + qcom,msm-mbhc-hphl-swh = <1>; + /delete-property/ qcom,us-euro-gpios; + /delete-property/ qcom,hph-en0-gpio; + /delete-property/ qcom,hph-en1-gpio; + qcom,wsa-max-devs = <1>; + qcom,wsa-devs = <&wsa881x_211>, <&wsa881x_213>; + qcom,wsa-aux-dev-prefix = "SpkrLeft", "SpkrLeft"; +}; + |