evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ARM: dts: msm: modify sound node for sdm660 qrd skus"

Browse source
This commit is contained in:
Linux Build Service Account 2017-01-31 04:42:28 -08:00 • committed by Gerrit - the friendly Code Review server
commit ac0b19ff2c
2 changed files with 26 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
arch/arm/boot/dts/qcom/sdm660-qrd.dts
View file

@ -64,25 +64,3 @@
&pm660l_wled { &pm660l_wled {
qcom,led-strings-list = [00 01]; 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";
};

26
arch/arm/boot/dts/qcom/sdm660-qrd.dtsi
View file

@ -12,6 +12,7 @@
#include "sdm660-pinctrl.dtsi" #include "sdm660-pinctrl.dtsi"
#include "sdm660-camera-sensor-qrd.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-jeita-thresholds = <0 5 55 55>;
qcom,fg-cutoff-voltage = <3700>; 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";
};