diff --git a/kera-audio-atp.dtsi b/kera-audio-atp.dtsi
index 3d2cee82..4f193ac6 100644
--- a/kera-audio-atp.dtsi
+++ b/kera-audio-atp.dtsi
@@ -21,7 +21,7 @@
 	qcom,wsa-max-devs = <0>;
 };
 
-&wsa_swr {
+&swr0 {
 	qcom,swr-num-dev = <0>;
 };
 
diff --git a/kera-audio-cdp.dtsi b/kera-audio-cdp.dtsi
index b14dcf5d..3bba2f68 100644
--- a/kera-audio-cdp.dtsi
+++ b/kera-audio-cdp.dtsi
@@ -58,7 +58,7 @@
 	status = "okay";
 };
 
-&wsa_swr {
+&swr0 {
 	wsa884x_0220: wsa884x@02170220 {
 		status = "okay";
 	};
diff --git a/kera-audio-lpass-reg.dtsi b/kera-audio-lpass-reg.dtsi
index d42a3289..4485f758 100644
--- a/kera-audio-lpass-reg.dtsi
+++ b/kera-audio-lpass-reg.dtsi
@@ -6,7 +6,7 @@
 	reg = <0x6AC0000 0x0>;
 };
 
-&rx_swr {
+&swr1 {
 	swrm-io-base = <0x6AD0000 0x0>;
 	interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
 };
@@ -19,12 +19,12 @@
 	reg = <0x6B00000 0x0>;
 };
 
-&wsa_swr {
+&swr0 {
 	swrm-io-base = <0x6B10000 0x0>;
 	interrupts = <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>;
 };
 
-&tx_swr {
+&swr2 {
 	reg = <0x7630000 0x0>;
 };
 
diff --git a/kera-audio-mtp-qmp1000.dtsi b/kera-audio-mtp-qmp1000.dtsi
index 4d803fc7..8f57194a 100644
--- a/kera-audio-mtp-qmp1000.dtsi
+++ b/kera-audio-mtp-qmp1000.dtsi
@@ -5,35 +5,8 @@
 
 #include "kera-audio-mtp.dtsi"
 
-&rx_swr {
-	qcom,swr-num-dev = <2>;
-};
 
-&wcd9378_rx_slave {
-	status = "okay";
-};
-
-&wcd9378_tx_slave {
-	status = "okay";
-};
-
-&wcd9378_codec {
-	status = "okay";
-};
-
-&wcd939x_rx_slave {
-	status = "disabled";
-};
-
-&wcd939x_tx_slave {
-	status = "disabled";
-};
-
-&wcd939x_codec {
-	status = "disabled";
-};
-
-&tx_swr {
+&swr2 {
 	qmp01: qmp@04170232 {
 		/*
 		 * reg = <Class_partID[7:0]
@@ -114,12 +87,12 @@
 &kera_snd {
 	qcom,model = "kera-mtp-qmp-snd-card";
 	asoc-codec  = <&stub_codec>, <&lpass_cdc>,
-			<&wcd9378_codec>,
+			<&wcd939x_codec>,
 			<&wsa884x_0220>, <&wsa884x_0221>,
 			<&qmp01>, <&qmp02>,
 			<&qmp03>, <&qmp04>;
 	asoc-codec-names = "msm-stub-codec.1", "lpass-cdc",
-		"wcd9378_codec",
+		"wcd939x_codec",
 		"wsa-codec1", "wsa-codec2",
 		"qmp-dmic.01", "qmp-dmic.02",
 		"qmp-dmic.03", "qmp-dmic.04";
@@ -132,9 +105,7 @@
 		"AMIC3", "Analog Mic3",
 		"AMIC3", "MIC BIAS3",
 		"AMIC4", "Analog Mic4",
-		"AMIC4", "MIC BIAS3",
-		"AMIC5", "Analog Mic5",
-		"AMIC5", "MIC BIAS4",
+		"AMIC4", "MIC BIAS1",
 		"VA AMIC1", "Analog Mic1",
 		"VA AMIC1", "VA MIC BIAS1",
 		"VA AMIC2", "Analog Mic2",
@@ -142,9 +113,7 @@
 		"VA AMIC3", "Analog Mic3",
 		"VA AMIC3", "VA MIC BIAS3",
 		"VA AMIC4", "Analog Mic4",
-		"VA AMIC4", "VA MIC BIAS3",
-		"VA AMIC5", "Analog Mic5",
-		"VA AMIC5", "VA MIC BIAS4",
+		"VA AMIC4", "VA MIC BIAS1",
 		"TX DMIC0", "Digital Mic0",
 		"TX DMIC0", "MIC BIAS3",
 		"TX DMIC1", "Digital Mic1",
@@ -155,7 +124,7 @@
 		"TX DMIC3", "MIC BIAS1",
 		"IN1_HPHL", "HPHL_OUT",
 		"IN2_HPHR", "HPHR_OUT",
-		"IN3_EAR", "AUX_OUT",
+		"IN3_AUX", "AUX_OUT",
 		"WSA SRC0_INP", "SRC0",
 		"WSA_TX DEC0_INP", "TX DEC0 MUX",
 		"WSA_TX DEC1_INP", "TX DEC1 MUX",
diff --git a/kera-audio-mtp.dtsi b/kera-audio-mtp.dtsi
index a7ec11dd..067fe728 100644
--- a/kera-audio-mtp.dtsi
+++ b/kera-audio-mtp.dtsi
@@ -30,11 +30,11 @@
 	};
 };
 
-&rx_swr {
+&swr1 {
 	qcom,swr-num-dev = <2>;
 };
 
-&wsa_swr {
+&swr0 {
 	qcom,swr-num-dev = <2>;
 };
 
@@ -156,7 +156,7 @@
 	swr-haptics-unsupported;
 	qcom,pri_mi2s_gpios = <&cdc_pri_mi2s_gpios>;
 	qcom,wcd-disable-legacy-surge;
-	//wcd939x-i2c-handle = <&wcd_usbss>;
+	wcd939x-i2c-handle = <&wcd_usbss>;
 	qcom,msm-mbhc-usbc-audio-supported = <0>;
 	qcom,msm-mbhc-hphl-swh = <1>;
 	qcom,msm-mbhc-gnd-swh = <1>;
diff --git a/kera-audio-overlay.dtsi b/kera-audio-overlay.dtsi
index f5034250..ea7d0954 100644
--- a/kera-audio-overlay.dtsi
+++ b/kera-audio-overlay.dtsi
@@ -37,7 +37,7 @@
 		qcom,use-clk-id = <VA_CORE_CLK>;
 		qcom,is-used-swr-gpio = <1>;
 		qcom,va-swr-gpios = <&va_swr_gpios>;
-		tx_swr: va_swr_master {
+		swr2: va_swr_master {
 			compatible = "qcom,swr-mstr";
 			#address-cells = <2>;
 			#size-cells = <0>;
@@ -48,7 +48,7 @@
 			qcom,swr_master_id = <3>;
 			qcom,mipi-sdw-block-packing-mode = <1>;
 			interrupts =
-				<GIC_SPI 722 IRQ_TYPE_LEVEL_HIGH>,
+				<GIC_SPI 721 IRQ_TYPE_LEVEL_HIGH>,
 				<GIC_SPI 520 IRQ_TYPE_LEVEL_HIGH>;
 			interrupt-names = "swr_master_irq", "swr_wake_irq";
 			qcom,swr-wakeup-required = <1>;
@@ -93,7 +93,7 @@
 		qcom,default-clk-id = <RX_TX_CORE_CLK>;
 		clock-names = "rx_mclk2_2x_clk";
 		clocks = <&clock_audio_rx_mclk2_2x_clk 0>;
-		rx_swr: rx_swr_master {
+		swr1: rx_swr_master {
 			compatible = "qcom,swr-mstr";
 			#address-cells = <2>;
 			#size-cells = <0>;
@@ -152,7 +152,7 @@
 		qcom,thermal-max-state = <11>;
 		qcom,noise-gate-mode = <2>;
 		#cooling-cells = <2>;
-		wsa_swr: wsa_swr_master {
+		swr0: wsa_swr_master {
 			compatible = "qcom,swr-mstr";
 			#address-cells = <2>;
 			#size-cells = <0>;
@@ -284,7 +284,7 @@
 		qcom,cdc-vdd-buck-current = <650000>;
 		qcom,cdc-vdd-buck-lpm-supported = <1>;
 
-		//cdc-vdd-mic-bias-supply = <&BOB>;
+		cdc-vdd-mic-bias-supply = <&BOB>;
 		qcom,cdc-vdd-mic-bias-voltage = <3296000 3296000>;
 		qcom,cdc-vdd-mic-bias-current = <30000>;
 
@@ -370,7 +370,7 @@
 		qcom,cdc-vdd-buck-current = <30070>;
 		qcom,cdc-vdd-buck-lpm-supported = <1>;
 
-	//	cdc-vdd-mic-bias-supply = <&BOB>;
+		cdc-vdd-mic-bias-supply = <&BOB>;
 		qcom,cdc-vdd-mic-bias-voltage = <3296000 3296000>;
 		qcom,cdc-vdd-mic-bias-current = <40550>;
 
diff --git a/kera-audio-qrd.dtsi b/kera-audio-qrd.dtsi
index 9768b064..a19f90b0 100644
--- a/kera-audio-qrd.dtsi
+++ b/kera-audio-qrd.dtsi
@@ -29,7 +29,7 @@
 	};
 };
 
-&wsa_swr {
+&swr0 {
 	wsa884x_0220: wsa884x@02170220 {
 		status = "disabled";
 	};
@@ -77,6 +77,7 @@
 
 &kera_snd {
 	qcom,model = "kera-qrd-snd-card";
+	swr-haptics-unsupported;
 	asoc-codec  = <&stub_codec>, <&lpass_cdc>,
 			<&wcd9378_codec>, <&wsa884x_0221>;
 	asoc-codec-names = "msm-stub-codec.1", "lpass-cdc",
diff --git a/kera-audio.dtsi b/kera-audio.dtsi
index e289da53..59d02973 100644
--- a/kera-audio.dtsi
+++ b/kera-audio.dtsi
@@ -135,7 +135,7 @@
 		};
 
 		va_macro: va-macro@7660000 {
-			tx_swr: va_swr_master {
+			swr2: va_swr_master {
 			};
 		};
 
@@ -143,12 +143,12 @@
 		};
 
 		rx_macro: rx-macro@6AC0000 {
-			rx_swr: rx_swr_master {
+			swr1: rx_swr_master {
 			};
 		};
 
 		wsa_macro: wsa-macro@6B00000 {
-			wsa_swr: wsa_swr_master {
+			swr0: wsa_swr_master {
 			};
 		};
 
@@ -174,12 +174,12 @@
 	};
 };
 
-//&aliases {
-//	wsa_swr = "/soc/spf_core_platform/lpass-cdc/wsa-macro@6B00000/wsa_swr_master";
-//	rx_swr = "/soc/spf_core_platform/lpass-cdc/rx-macro@6AC0000/rx_swr_master";
-//	tx_swr = "/soc/spf_core_platform/lpass-cdc/va-macro@7660000/va_swr_master";
-//	swr4 = "/soc/spf_core_platform/lpass_bt_swr@6CA0000/bt_swr_mstr";
-//};
+&aliases {
+	swr0 = "/soc/spf_core_platform/lpass-cdc/wsa-macro@6B00000/wsa_swr_master";
+	swr1 = "/soc/spf_core_platform/lpass-cdc/rx-macro@6AC0000/rx_swr_master";
+	swr2 = "/soc/spf_core_platform/lpass-cdc/va-macro@7660000/va_swr_master";
+	swr4 = "/soc/spf_core_platform/lpass_bt_swr@6CA0000/bt_swr_mstr";
+};
 
 &adsp_loader {
 	/delete-property/ qcom,adsp-state;
diff --git a/kera-lpi.dtsi b/kera-lpi.dtsi
index ebf2e7b9..70127681 100644
--- a/kera-lpi.dtsi
+++ b/kera-lpi.dtsi
@@ -1804,7 +1804,7 @@
 			};
 
 			config {
-				pins = "gpio4";
+				pins = "gpio14";
 				drive-strength = <2>;
 				input-enable;
 				bias-pull-down;