Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 909ce138 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Disable haptics for yupik atp"

parents 793fcc9b c4f6d483

qcom/yupik-atp.dtsi

+6 −10
Original line number Original line Diff line number Diff line
@@ -332,11 +332,6 @@ 
	status = "disabled";

	status = "disabled";

};

};





&swr_haptics {

	status = "okay";

	swr-slave-supply = <&hap_swr_slave_reg>;

};



&yupik_snd {

&yupik_snd {

	qcom,model = "lahaina-yupikqrd-snd-card";

	qcom,model = "lahaina-yupikqrd-snd-card";

	qcom,audio-routing =

	qcom,audio-routing =
@@ -363,7 +358,6 @@ 
		"IN1_HPHL", "HPHL_OUT",

		"IN1_HPHL", "HPHL_OUT",

		"IN2_HPHR", "HPHR_OUT",

		"IN2_HPHR", "HPHR_OUT",

		"IN3_AUX", "AUX_OUT",

		"IN3_AUX", "AUX_OUT",

		"HAP_IN", "PCM_OUT",

		"WSA SRC0_INP", "SRC0",

		"WSA SRC0_INP", "SRC0",

		"WSA_TX DEC0_INP", "TX DEC0 MUX",

		"WSA_TX DEC0_INP", "TX DEC0 MUX",

		"WSA_TX DEC1_INP", "TX DEC1 MUX",

		"WSA_TX DEC1_INP", "TX DEC1 MUX",
@@ -396,11 +390,13 @@ 
	qcom,msm-mbhc-gnd-swh = <1>;

	qcom,msm-mbhc-gnd-swh = <1>;





	asoc-codec  = <&stub_codec>, <&bolero>,

	asoc-codec  = <&stub_codec>, <&bolero>,

		      <&wcd938x_codec>, <&swr_haptics>,

		      <&wcd938x_codec>,

		      <&wsa883x_0222>;

		      <&wsa883x_0222>,

		      <&ext_disp_audio_codec>;

	asoc-codec-names = "msm-stub-codec.1", "bolero_codec",

	asoc-codec-names = "msm-stub-codec.1", "bolero_codec",

			   "wcd938x_codec", "swr-haptics",

			   "wcd938x_codec",

			   "wsa-codec2";

			   "wsa-codec2",

			   "msm-ext-disp-audio-codec-rx";

	qcom,wsa-max-devs = <1>;

	qcom,wsa-max-devs = <1>;

	qcom,msm_audio_ssr_devs = <&audio_apr>, <&q6core>, <&lpi_tlmm>,

	qcom,msm_audio_ssr_devs = <&audio_apr>, <&q6core>, <&lpi_tlmm>,

				  <&bolero>;

				  <&bolero>;