mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-14 00:24:41 -04:00
Merge "ARM: dts: msm: Disable haptics for yupik atp"
This commit is contained in:
commit
ffcadb3052
1 changed files with 6 additions and 10 deletions
|
|
@ -332,11 +332,6 @@
|
|||
status = "disabled";
|
||||
};
|
||||
|
||||
&swr_haptics {
|
||||
status = "okay";
|
||||
swr-slave-supply = <&hap_swr_slave_reg>;
|
||||
};
|
||||
|
||||
&yupik_snd {
|
||||
qcom,model = "lahaina-yupikqrd-snd-card";
|
||||
qcom,audio-routing =
|
||||
|
|
@ -363,7 +358,6 @@
|
|||
"IN1_HPHL", "HPHL_OUT",
|
||||
"IN2_HPHR", "HPHR_OUT",
|
||||
"IN3_AUX", "AUX_OUT",
|
||||
"HAP_IN", "PCM_OUT",
|
||||
"WSA SRC0_INP", "SRC0",
|
||||
"WSA_TX DEC0_INP", "TX DEC0 MUX",
|
||||
"WSA_TX DEC1_INP", "TX DEC1 MUX",
|
||||
|
|
@ -396,11 +390,13 @@
|
|||
qcom,msm-mbhc-gnd-swh = <1>;
|
||||
|
||||
asoc-codec = <&stub_codec>, <&bolero>,
|
||||
<&wcd938x_codec>, <&swr_haptics>,
|
||||
<&wsa883x_0222>;
|
||||
<&wcd938x_codec>,
|
||||
<&wsa883x_0222>,
|
||||
<&ext_disp_audio_codec>;
|
||||
asoc-codec-names = "msm-stub-codec.1", "bolero_codec",
|
||||
"wcd938x_codec", "swr-haptics",
|
||||
"wsa-codec2";
|
||||
"wcd938x_codec",
|
||||
"wsa-codec2",
|
||||
"msm-ext-disp-audio-codec-rx";
|
||||
qcom,wsa-max-devs = <1>;
|
||||
qcom,msm_audio_ssr_devs = <&audio_apr>, <&q6core>, <&lpi_tlmm>,
|
||||
<&bolero>;
|
||||
|
|
|
|||
Loading…
Reference in a new issue