From e64cff4fb03907baa49162ddcf2253f2d5059392 Mon Sep 17 00:00:00 2001
From: Vatsal Bucha <vbucha@qti.qualcomm.com>
Date: Mon, 1 Feb 2021 16:37:13 +0530
Subject: [PATCH] ARM: dts: msm: Disable haptics for yupik atp

Disable haptics for yupik atp and enable both wsa.

Change-Id: I0fcfa71931aabcfdf075a765d287a1edfbd1b8a5
---
 qcom/yupik-atp.dtsi | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/qcom/yupik-atp.dtsi b/qcom/yupik-atp.dtsi
index 45631c00e0c6..e92d835c7d4d 100644
--- a/qcom/yupik-atp.dtsi
+++ b/qcom/yupik-atp.dtsi
@@ -326,11 +326,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 =
@@ -357,7 +352,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",
@@ -390,11 +384,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>;