diff --git a/tuna-audio-cdp.dtsi b/tuna-audio-cdp.dtsi
index 31e7cff7..0fba8c7b 100644
--- a/tuna-audio-cdp.dtsi
+++ b/tuna-audio-cdp.dtsi
@@ -65,7 +65,6 @@
 
 &tuna_snd {
 	qcom,model = "tuna-cdp-snd-card";
-	swr-haptics-unsupported;
 	qcom,audio-routing =
 		"AMIC1", "Analog Mic1",
 		"AMIC1", "MIC BIAS1",
diff --git a/tuna-audio-mtp.dtsi b/tuna-audio-mtp.dtsi
index 996187eb..343c2d49 100644
--- a/tuna-audio-mtp.dtsi
+++ b/tuna-audio-mtp.dtsi
@@ -11,6 +11,5 @@
 
 &tuna_snd {
 	qcom,model = "tuna-mtp-snd-card";
-	swr-haptics-unsupported;
 	qcom,sec-mi2s-gpios = <&fm_i2s1_gpios>;
 };
diff --git a/tuna-audio-overlay.dtsi b/tuna-audio-overlay.dtsi
index 1af02067..66bcccf9 100644
--- a/tuna-audio-overlay.dtsi
+++ b/tuna-audio-overlay.dtsi
@@ -127,7 +127,6 @@
 			swr_haptics: swr_haptics@f0170220 {
 				compatible = "qcom,pmih010x-swr-haptics";
 				reg = <0x03 0xf0170220>;
-				//swr-slave-supply = <&hap_swr_slave_reg>;
 				qcom,rx_swr_ch_map = <0 0x01 0x01 0 PCM_OUT1>;
 				status = "disabled";
 			};
diff --git a/tuna-audio-qrd.dtsi b/tuna-audio-qrd.dtsi
index 880b49be..87ed7cf6 100644
--- a/tuna-audio-qrd.dtsi
+++ b/tuna-audio-qrd.dtsi
@@ -63,6 +63,11 @@
 	qcom,wsa-bat-cfgs = <1>, <1>;
 };
 
+&swr_haptics {
+	status = "okay";
+	swr-slave-supply = <&hap_swr_slave_reg>;
+};
+
 &wcd939x_codec {
 	status = "okay";
 	/* 0 for digital crosstalk disabled,
@@ -91,7 +96,6 @@
 
 &tuna_snd {
 	qcom,model = "tuna-qrd-snd-card";
-	swr-haptics-unsupported;
 	qcom,audio-routing =
 		"AMIC1", "Analog Mic1",
 		"AMIC1", "MIC BIAS1",
@@ -126,9 +130,9 @@
 		"VA_AIF1 CAP", "VA_SWR_CLK",
 		"VA_AIF2 CAP", "VA_SWR_CLK",
 		"VA_AIF3 CAP", "VA_SWR_CLK";
-	asoc-codec  = <&stub_codec>, <&lpass_cdc>,
+	asoc-codec  = <&stub_codec>, <&lpass_cdc>, <&swr_haptics>,
 			<&wcd939x_codec>, <&wsa884x_0220>;
-	asoc-codec-names = "msm-stub-codec.1", "lpass-cdc",
+	asoc-codec-names = "msm-stub-codec.1", "lpass-cdc","swr_haptics",
 			"wcd939x_codec", "wsa-codec1";
 	qcom,ext-disp-audio-rx = <1>;
 	qcom,wsa-max-devs = <1>;