diff --git a/Makefile.am b/Makefile.am
index 5e3faccf5492..207f76746eb3 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,7 +44,7 @@ obj-m += asoc/codecs/bolero/
 obj-m += asoc/codecs/wcd937x/
 endif
 
-ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), sa8155 sa8155ivi sa6155 sa8195 qtiquingvm qtiquingvm8295 sa8295 qtigvmi3))
+ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), sa8155 sa8155ivi sa6155 sa8195 qtiquingvm qtiquingvm8295 sa8295))
 KBUILD_OPTIONS += CONFIG_SND_SOC_AUTO=y
 obj-m := ipc/
 obj-m += dsp/
@@ -57,14 +57,22 @@ endif
 ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), sa6155))
 KBUILD_OPTIONS += CONFIG_SND_SOC_SA6155=m
 endif
-ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), qtiquingvm qtigvmi3))
+ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), qtiquingvm))
 KBUILD_OPTIONS += CONFIG_SND_SOC_GVM=m
 endif
 ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), qtiquingvm8295))
 KBUILD_OPTIONS += CONFIG_SND_SOC_GVM_SA8295=m
 endif
 endif
-
+ifeq ($(AR_SUPPORT), $(filter $(AR_SUPPORT), yes))
+obj-m := ipc/
+obj-m += dsp/
+obj-m += asoc/
+obj-m += asoc/codecs/
+obj-m += soc/
+KBUILD_OPTIONS += CONFIG_SND_SOC_AUTO=y
+KBUILD_OPTIONS += CONFIG_SND_SOC_AR=m
+endif
 all:
 	$(shell rm -fr $(shell pwd)/soc/core.h)
 	$(shell ln -s $(KERNEL_SRC)/drivers/pinctrl/core.h $(shell pwd)/soc/core.h)
diff --git a/asoc/Kbuild b/asoc/Kbuild
old mode 100644
new mode 100755
index 8f105ae11d28..84aaa73b3eeb
--- a/asoc/Kbuild
+++ b/asoc/Kbuild
@@ -29,6 +29,11 @@ ifeq ($(CONFIG_SND_SOC_AUTO), y)
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/gvmautoconf.h
 	endif
+	ifdef CONFIG_SND_SOC_AR
+		include $(AUDIO_ROOT)/config/arauto.conf
+		export
+		INCS    +=  -include $(AUDIO_ROOT)/config/arautoconf.h
+	endif
 	ifdef CONFIG_SND_SOC_GVM_SA8295
 		include $(AUDIO_ROOT)/config/sa8295gvmauto.conf
 		export
diff --git a/asoc/codecs/Kbuild b/asoc/codecs/Kbuild
index 0e842ee1bf6c..8f19011f6f02 100755
--- a/asoc/codecs/Kbuild
+++ b/asoc/codecs/Kbuild
@@ -29,6 +29,11 @@ ifeq ($(CONFIG_SND_SOC_AUTO), y)
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/gvmautoconf.h
 	endif
+	ifdef CONFIG_SND_SOC_AR
+		include $(AUDIO_ROOT)/config/arauto.conf
+		export
+		INCS    +=  -include $(AUDIO_ROOT)/config/arautoconf.h
+	endif
 	ifdef CONFIG_SND_SOC_GVM_SA8295
 		include $(AUDIO_ROOT)/config/sa8295gvmauto.conf
 		export
diff --git a/config/arauto.conf b/config/arauto.conf
new file mode 100755
index 000000000000..36eb6be8a26f
--- /dev/null
+++ b/config/arauto.conf
@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: GPL-2.0-only
+# Copyright (c) 2021, The Linux Foundation. All rights reserved.
+
+ifeq ($(CONFIG_QGKI), y)
+export CONFIG_SND_SOC_GVM_AUTO_SPF=m
+export CONFIG_MSM_QDSP6_APRV2_VM=m
+export CONFIG_MSM_QDSP6_SSR=m
+export CONFIG_MSM_ADSP_LOADER=m
+export CONFIG_MSM_QDSP6_NOTIFIER=m
+export CONFIG_SND_SOC_MSM_QDSP6V2_VM=m
+export CONFIG_SND_SOC_QDSP6V2=m
+export CONFIG_QTI_PP=m
+export CONFIG_SND_HWDEP_ROUTING=m
+export CONFIG_SND_SOC_MSM_STUB=m
+export CONFIG_SND_SOC_MSM_HDMI_CODEC_RX=m
+export CONFIG_MSM_QDSP6V2_CODECS=m
+export CONFIG_SND_EVENT=m
+export CONFIG_SND_SOC_SA8155=m
+endif
\ No newline at end of file
diff --git a/config/arautoconf.h b/config/arautoconf.h
new file mode 100755
index 000000000000..6e28cae199ca
--- /dev/null
+++ b/config/arautoconf.h
@@ -0,0 +1,27 @@
+/* Copyright (c) 2018-2019, 2021 The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#define CONFIG_SND_SOC_GVM_AUTO_SPF 1
+#define CONFIG_MSM_QDSP6_APRV2_VM 1
+#define CONFIG_MSM_ADSP_LOADER 1
+#define CONFIG_MSM_QDSP6_SSR 1
+#define CONFIG_MSM_QDSP6_NOTIFIER 1
+#define CONFIG_SND_SOC_MSM_QDSP6V2_VM 1
+#define CONFIG_SND_SOC_QDSP6V2 1
+#define CONFIG_QTI_PP 1
+#define CONFIG_SND_HWDEP_ROUTING 1
+#define CONFIG_SND_SOC_MSM_STUB 1
+#define CONFIG_SND_SOC_MSM_HDMI_CODEC_RX 1
+#define CONFIG_MSM_QDSP6V2_CODECS 1
+#define CONFIG_SND_EVENT 1
+#define CONFIG_SND_SOC_SA8155 1
+
diff --git a/dsp/Kbuild b/dsp/Kbuild
index 788a7d3c5a28..2c5506ff7c5c 100755
--- a/dsp/Kbuild
+++ b/dsp/Kbuild
@@ -29,6 +29,11 @@ ifeq ($(CONFIG_SND_SOC_AUTO), y)
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/gvmautoconf.h
 	endif
+	ifdef CONFIG_SND_SOC_AR
+		include $(AUDIO_ROOT)/config/arauto.conf
+		export
+		INCS    +=  -include $(AUDIO_ROOT)/config/arautoconf.h
+	endif
 	ifdef CONFIG_SND_SOC_GVM_SA8295
 		include $(AUDIO_ROOT)/config/sa8295gvmauto.conf
 		export
diff --git a/ipc/Kbuild b/ipc/Kbuild
index 1d76bae1069e..06a1f42b9063 100755
--- a/ipc/Kbuild
+++ b/ipc/Kbuild
@@ -30,6 +30,11 @@ ifeq ($(CONFIG_SND_SOC_AUTO), y)
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/gvmautoconf.h
 	endif
+	ifdef CONFIG_SND_SOC_AR
+		include $(AUDIO_ROOT)/config/arauto.conf
+		export
+		INCS    +=  -include $(AUDIO_ROOT)/config/arautoconf.h
+	endif
 	ifdef CONFIG_SND_SOC_GVM_SA8295
 		include $(AUDIO_ROOT)/config/sa8295gvmauto.conf
 		export
diff --git a/soc/Kbuild b/soc/Kbuild
index 8ddec0d2625e..edb9aeee478b 100755
--- a/soc/Kbuild
+++ b/soc/Kbuild
@@ -29,6 +29,11 @@ ifeq ($(CONFIG_SND_SOC_AUTO), y)
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/gvmautoconf.h
 	endif
+	ifdef CONFIG_SND_SOC_AR
+		include $(AUDIO_ROOT)/config/arauto.conf
+		export
+		INCS    +=  -include $(AUDIO_ROOT)/config/arautoconf.h
+	endif
 	ifdef CONFIG_SND_SOC_GVM_SA8295
 		include $(AUDIO_ROOT)/config/sa8295gvmauto.conf
 		export