diff --git a/qcom/blair-fogo-common-overlay.dtsi b/qcom/blair-fogo-common-overlay.dtsi
index 9f18dcb472de..cebd752aed82 100644
--- a/qcom/blair-fogo-common-overlay.dtsi
+++ b/qcom/blair-fogo-common-overlay.dtsi
@@ -9,7 +9,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
-#include "holi-audio-fogo-overlay.dtsi"
+#include "fogo-audio-wcd9370-aw882xx-acf-dual-overlay.dtsi"
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/linux-event-codes.h>
 #include "holi-pmic-overlay-pm6125.dtsi"
diff --git a/qcom/holi-audio-fogo-overlay.dtsi b/qcom/fogo-audio-wcd9370-aw882xx-acf-dual-overlay.dtsi
similarity index 84%
rename from qcom/holi-audio-fogo-overlay.dtsi
rename to qcom/fogo-audio-wcd9370-aw882xx-acf-dual-overlay.dtsi
index 238c57cff51b..40470f0308dc 100644
--- a/qcom/holi-audio-fogo-overlay.dtsi
+++ b/qcom/fogo-audio-wcd9370-aw882xx-acf-dual-overlay.dtsi
@@ -5,28 +5,27 @@
 #include <dt-bindings/gpio/gpio.h>
 
 &tlmm{
-	fsm_rcv_rst: fsm_rcv_rst {
+	aw882xx_irq_default: aw882xx_irq_default {
 		mux {
-			pins = "gpio86";
+			pins = "gpio59";
 			function = "gpio";
 		};
 		config {
-			pins = "gpio86";
+			pins = "gpio59";
 			drive-strength = <2>; /* 2 MA */
-			bias-pull-down;
-			output-low;
+			bias-pull-up;
 		};
 	};
-	fsm_spk_rst: fsm_spk_rst {
+
+	aw882xx_recv_irq_default: aw882xx_recv_irq_default {
 		mux {
-			pins = "gpio58";
+			pins = "gpio48";
 			function = "gpio";
 		};
 		config {
-			pins = "gpio58";
+			pins = "gpio48";
 			drive-strength = <2>; /* 2 MA */
-			bias-pull-down;
-			output-low;
+			bias-pull-up;
 		};
 	};
 };
@@ -50,7 +49,7 @@
 
 &dai_mi2s0_tx {
 	status = "okay";
-	qcom,msm-mi2s-lines = <0>;
+	qcom,msm-mi2s-lines = <2>;
 };
 
 &dai_mi2s1_rx {
@@ -60,7 +59,7 @@
 
 &dai_mi2s1_tx {
 	status = "okay";
-	qcom,msm-mi2s-lines = <2>;
+	qcom,msm-mi2s-lines = <0>;
 };
 
 &dai_mi2s2_rx {
@@ -83,6 +82,18 @@
 	qcom,msm-mi2s-lines = <0>;
 };
 
+&q6core {
+	cdc_pri_mi2s_gpios: cdc_pri_mi2s_gpios {
+		compatible = "qcom,msm-cdc-pinctrl";
+		pinctrl-names = "aud_active", "aud_sleep";
+		pinctrl-0 = <&lpi_i2s1_sck_active &lpi_i2s1_ws_active &lpi_i2s1_sd0_active &lpi_i2s1_sd1_active>;
+		pinctrl-1 = <&lpi_i2s1_sck_sleep &lpi_i2s1_ws_sleep &lpi_i2s1_sd0_sleep &lpi_i2s1_sd1_sleep>;
+		qcom,lpi-gpios;
+		 #gpio-cells = <0>;
+	};
+
+};
+
 &bolero {
 	qcom,num-macros = <3>;
 	qcom,bolero-version = <5>;
@@ -247,10 +258,12 @@
 };
 
 &holi_snd {
-	qcom,model = "holi-9370_fs1815-snd-card";
+	qcom,model = "holi-9370_aw882xx-snd-card";
+	qcom,msm-mi2s-master = <1>, <1>, <1>, <1>;
 	qcom,wcn-btfm = <1>;
 	qcom,tdm-max-slots = <4>;
-	qcom,mi2s-audio-intf = <0>;
+	qcom,pri-mi2s-gpios = <&cdc_pri_mi2s_gpios>;
+	qcom,mi2s-audio-intf = <1>;
 
 	qcom,audio-routing =
 		"AMIC1", "Analog Mic1",
@@ -294,9 +307,9 @@
 	qcom,msm-mbhc-hphl-swh = <1>;
 	qcom,msm-mbhc-gnd-swh = <1>;
 	asoc-codec  = <&stub_codec>, <&bolero>,
-		      <&wcd937x_codec>;
+		      <&wcd937x_codec>,<&aw882xxacf>,<&aw882xxacf_recv>;
 	asoc-codec-names = "msm-stub-codec.1", "bolero_codec",
-			   "wcd937x_codec";
+			   "wcd937x_codec", "aw882xxacf_smartpa.2-0034", "aw882xxacf_smartpa.2-0035";
 	qcom,msm_audio_ssr_devs = <&audio_apr>, <&q6core>, <&lpi_tlmm>,
 				  <&bolero>;
 	qcom,msm-mbhc-hs-mic-max-threshold-mv = <2700>;
@@ -305,21 +318,36 @@
 
 &qupv3_se10_i2c {
         status = "ok";
-        fs1815_rcv: fs1815_rcv@34{
-            compatible = "foursemi,fs1815";
-            reg = <0x34>;
-            pinctrl-names = "default";
-            pinctrl-0 = <&fsm_rcv_rst>;
-            fsm,rst-gpio = <&tlmm 86 0x00>;
-            status = "okay";
-        };
-        fs1815_spk: fs1815_spk@35{
-            compatible = "foursemi,fs1815";
-            reg = <0x35>;
-            pinctrl-names = "default";
-            pinctrl-0 = <&fsm_spk_rst>;
-            fsm,rst-gpio = <&tlmm 58 0x00>;
-            status = "okay";
+        aw882xxacf: aw882xxacf_smartpa@34 {
+		compatible = "awinic,aw882xxacf_smartpa";
+		reg = <0x34>;
+		dc-flag = <0>;
+		sound-channel = <0>;
+		aw-tx-topo-id = <0x1000ff00>;
+		aw-rx-topo-id = <0x1000ff01>;
+		aw-rx-port-id = <0x1000>;
+		aw-tx-port-id = <0x1001>;
+		aw-re-min = <4000>;
+		aw-re-max = <30000>;
+		aw-cali-mode = "aw_attr";
+		skt-prof-mode = <1>;
+		status = "okay";
+		};
+        aw882xxacf_recv: aw882xxacf_recv_smartpa@35 {
+		compatible = "awinic,aw882xxacf_smartpa";
+                reg = <0x35>;
+                dc-flag = <0>;
+                sync-flag = <0>;
+                sound-channel = <1>;
+		aw-tx-topo-id = <0x1000ff00>;
+		aw-rx-topo-id = <0x1000ff01>;
+		aw-rx-port-id = <0x1000>;
+		aw-tx-port-id = <0x1001>;
+		aw-re-min = <4000>;
+		aw-re-max = <30000>;
+		aw-cali-mode = "aw_attr";
+		skt-prof-mode = <1>;
+		status = "okay";
         };
 };