diff --git a/Makefile.am b/Makefile.am
old mode 100644
new mode 100755
index 3284ab07739c..bef7f39ed2c0
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,12 +46,15 @@ obj-m += dsp/
 obj-m += asoc/
 obj-m += asoc/codecs/
 obj-m += soc/
-ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), sa8155 sa8155ivi sa8195 qtiquingvm))
+ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), sa8155 sa8155ivi sa8195))
 KBUILD_OPTIONS += CONFIG_SND_SOC_SA8155=m
 endif
 ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), sa6155))
 KBUILD_OPTIONS += CONFIG_SND_SOC_SA6155=m
 endif
+ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), qtiquingvm))
+KBUILD_OPTIONS += CONFIG_SND_SOC_GVM=m
+endif
 endif
 
 define PROCESS_HEADERS
diff --git a/asoc/Kbuild b/asoc/Kbuild
old mode 100644
new mode 100755
index 4d5b84e69a21..990adc3212d7
--- a/asoc/Kbuild
+++ b/asoc/Kbuild
@@ -24,71 +24,76 @@ ifeq ($(CONFIG_SND_SOC_AUTO), y)
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/sa6155autoconf.h
 	endif
-else
-ifeq ($(KERNEL_BUILD), 0)
-	ifeq ($(CONFIG_ARCH_SM8150), y)
-		ifdef CONFIG_SND_SOC_SA8155
-			include $(AUDIO_ROOT)/config/sa8155auto.conf
-			export
-			INCS    +=  -include $(AUDIO_ROOT)/config/sa8155autoconf.h
-		else
-			include $(AUDIO_ROOT)/config/sm8150auto.conf
-			export
-			INCS    +=  -include $(AUDIO_ROOT)/config/sm8150autoconf.h
-		endif
-	endif
-	ifeq ($(CONFIG_ARCH_SM6150), y)
-		ifdef CONFIG_SND_SOC_SA6155
-			include $(AUDIO_ROOT)/config/sa6155auto.conf
-			export
-			INCS    +=  -include $(AUDIO_ROOT)/config/sa6155autoconf.h
-		else
-			include $(AUDIO_ROOT)/config/sm6150auto.conf
-			export
-			INCS    +=  -include $(AUDIO_ROOT)/config/sm6150autoconf.h
-		endif
-	endif
-	ifeq ($(CONFIG_ARCH_TRINKET), y)
-		include $(AUDIO_ROOT)/config/sm6150auto.conf
-		export
-		INCS    +=  -include $(AUDIO_ROOT)/config/sm6150autoconf.h
-	endif
-	ifeq ($(CONFIG_ARCH_KONA), y)
-		include $(AUDIO_ROOT)/config/konaauto.conf
-		INCS    +=  -include $(AUDIO_ROOT)/config/konaautoconf.h
-	endif
-	ifeq ($(CONFIG_ARCH_LITO), y)
-		include $(AUDIO_ROOT)/config/litoauto.conf
-		export
-		INCS    +=  -include $(AUDIO_ROOT)/config/litoautoconf.h
-	endif
-	ifeq ($(CONFIG_ARCH_BENGAL), y)
-		include $(AUDIO_ROOT)/config/bengalauto.conf
-		export
-		INCS    +=  -include $(AUDIO_ROOT)/config/bengalautoconf.h
-	endif
-	ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
-		ifdef CONFIG_SND_SOC_SA8155
-			include $(AUDIO_ROOT)/config/sa8155auto.conf
-			export
-			INCS    +=  -include $(AUDIO_ROOT)/config/sa8155autoconf.h
-		else
-			include $(AUDIO_ROOT)/config/sm8150auto.conf
-			export
-			INCS    +=  -include $(AUDIO_ROOT)/config/sm8150autoconf.h
-		endif
-	endif
-	ifeq ($(CONFIG_ARCH_QCS405), y)
-		include $(AUDIO_ROOT)/config/qcs405auto.conf
-		export
-		INCS    +=  -include $(AUDIO_ROOT)/config/qcs405autoconf.h
-	endif
-	ifeq ($(CONFIG_QTI_QUIN_GVM), y)
+	ifdef CONFIG_SND_SOC_GVM
 		include $(AUDIO_ROOT)/config/gvmauto.conf
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/gvmautoconf.h
 	endif
-endif
+else
+	ifeq ($(KERNEL_BUILD), 0)
+		ifeq ($(CONFIG_ARCH_SM8150), y)
+			ifdef CONFIG_SND_SOC_SA8155
+				include $(AUDIO_ROOT)/config/sa8155auto.conf
+				export
+				INCS    +=  -include $(AUDIO_ROOT)/config/sa8155autoconf.h
+			else
+				include $(AUDIO_ROOT)/config/sm8150auto.conf
+				export
+				INCS    +=  -include $(AUDIO_ROOT)/config/sm8150autoconf.h
+			endif
+		endif
+		ifeq ($(CONFIG_ARCH_SM6150), y)
+			ifdef CONFIG_SND_SOC_SA6155
+				include $(AUDIO_ROOT)/config/sa6155auto.conf
+				export
+				INCS    +=  -include $(AUDIO_ROOT)/config/sa6155autoconf.h
+			else
+				include $(AUDIO_ROOT)/config/sm6150auto.conf
+				export
+				INCS    +=  -include $(AUDIO_ROOT)/config/sm6150autoconf.h
+			endif
+		endif
+		ifeq ($(CONFIG_ARCH_TRINKET), y)
+			include $(AUDIO_ROOT)/config/sm6150auto.conf
+			export
+			INCS    +=  -include $(AUDIO_ROOT)/config/sm6150autoconf.h
+		endif
+		ifeq ($(CONFIG_ARCH_KONA), y)
+			include $(AUDIO_ROOT)/config/konaauto.conf
+			INCS    +=  -include $(AUDIO_ROOT)/config/konaautoconf.h
+		endif
+		ifeq ($(CONFIG_ARCH_LITO), y)
+			include $(AUDIO_ROOT)/config/litoauto.conf
+			export
+			INCS    +=  -include $(AUDIO_ROOT)/config/litoautoconf.h
+		endif
+		ifeq ($(CONFIG_ARCH_BENGAL), y)
+			include $(AUDIO_ROOT)/config/bengalauto.conf
+			export
+			INCS    +=  -include $(AUDIO_ROOT)/config/bengalautoconf.h
+		endif
+		ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
+			ifdef CONFIG_SND_SOC_SA8155
+				include $(AUDIO_ROOT)/config/sa8155auto.conf
+				export
+				INCS    +=  -include $(AUDIO_ROOT)/config/sa8155autoconf.h
+			else
+				include $(AUDIO_ROOT)/config/sm8150auto.conf
+				export
+				INCS    +=  -include $(AUDIO_ROOT)/config/sm8150autoconf.h
+			endif
+		endif
+		ifeq ($(CONFIG_ARCH_QCS405), y)
+			include $(AUDIO_ROOT)/config/qcs405auto.conf
+			export
+			INCS    +=  -include $(AUDIO_ROOT)/config/qcs405autoconf.h
+		endif
+		ifeq ($(CONFIG_QTI_QUIN_GVM), y)
+			include $(AUDIO_ROOT)/config/gvmauto.conf
+			export
+			INCS    +=  -include $(AUDIO_ROOT)/config/gvmautoconf.h
+		endif
+	endif
 endif
 
 # As per target team, build is done as follows:
diff --git a/asoc/codecs/Kbuild b/asoc/codecs/Kbuild
old mode 100644
new mode 100755
index 59550f002028..41ee81e3488d
--- a/asoc/codecs/Kbuild
+++ b/asoc/codecs/Kbuild
@@ -24,65 +24,70 @@ ifeq ($(CONFIG_SND_SOC_AUTO), y)
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/sa6155autoconf.h
 	endif
-else
-ifeq ($(KERNEL_BUILD), 0)
-	ifeq ($(CONFIG_ARCH_SM8150), y)
-		ifdef CONFIG_SND_SOC_SA8155
-			include $(AUDIO_ROOT)/config/sa8155auto.conf
-			export
-			INCS    +=  -include $(AUDIO_ROOT)/config/sa8155autoconf.h
-		else
-			include $(AUDIO_ROOT)/config/sm8150auto.conf
-			export
-			INCS    +=  -include $(AUDIO_ROOT)/config/sm8150autoconf.h
-		endif
-	endif
-	ifeq ($(CONFIG_ARCH_SM6150), y)
-		ifdef CONFIG_SND_SOC_SA6155
-			include $(AUDIO_ROOT)/config/sa6155auto.conf
-			export
-			INCS    +=  -include $(AUDIO_ROOT)/config/sa6155autoconf.h
-		else
-			include $(AUDIO_ROOT)/config/sm6150auto.conf
-			export
-			INCS    +=  -include $(AUDIO_ROOT)/config/sm6150autoconf.h
-		endif
-	endif
-	ifeq ($(CONFIG_ARCH_TRINKET), y)
-		include $(AUDIO_ROOT)/config/sm6150auto.conf
-		export
-		INCS    +=  -include $(AUDIO_ROOT)/config/sm6150autoconf.h
-	endif
-	ifeq ($(CONFIG_ARCH_KONA), y)
-		include $(AUDIO_ROOT)/config/konaauto.conf
-		INCS    +=  -include $(AUDIO_ROOT)/config/konaautoconf.h
-	endif
-	ifeq ($(CONFIG_ARCH_LITO), y)
-		include $(AUDIO_ROOT)/config/litoauto.conf
-		export
-		INCS    +=  -include $(AUDIO_ROOT)/config/litoautoconf.h
-	endif
-	ifeq ($(CONFIG_ARCH_BENGAL), y)
-		include $(AUDIO_ROOT)/config/bengalauto.conf
-		export
-		INCS    +=  -include $(AUDIO_ROOT)/config/bengalautoconf.h
-	endif
-	ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
-		include $(AUDIO_ROOT)/config/sm8150auto.conf
-		export
-		INCS    +=  -include $(AUDIO_ROOT)/config/sm8150autoconf.h
-	endif
-	ifeq ($(CONFIG_ARCH_QCS405), y)
-		include $(AUDIO_ROOT)/config/qcs405auto.conf
-		export
-		INCS    +=  -include $(AUDIO_ROOT)/config/qcs405autoconf.h
-	endif
-	ifeq ($(CONFIG_QTI_QUIN_GVM), y)
+	ifdef CONFIG_SND_SOC_GVM
 		include $(AUDIO_ROOT)/config/gvmauto.conf
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/gvmautoconf.h
 	endif
-endif
+else
+	ifeq ($(KERNEL_BUILD), 0)
+		ifeq ($(CONFIG_ARCH_SM8150), y)
+			ifdef CONFIG_SND_SOC_SA8155
+				include $(AUDIO_ROOT)/config/sa8155auto.conf
+				export
+				INCS    +=  -include $(AUDIO_ROOT)/config/sa8155autoconf.h
+			else
+				include $(AUDIO_ROOT)/config/sm8150auto.conf
+				export
+				INCS    +=  -include $(AUDIO_ROOT)/config/sm8150autoconf.h
+			endif
+		endif
+		ifeq ($(CONFIG_ARCH_SM6150), y)
+			ifdef CONFIG_SND_SOC_SA6155
+				include $(AUDIO_ROOT)/config/sa6155auto.conf
+				export
+				INCS    +=  -include $(AUDIO_ROOT)/config/sa6155autoconf.h
+			else
+				include $(AUDIO_ROOT)/config/sm6150auto.conf
+				export
+				INCS    +=  -include $(AUDIO_ROOT)/config/sm6150autoconf.h
+			endif
+		endif
+		ifeq ($(CONFIG_ARCH_TRINKET), y)
+			include $(AUDIO_ROOT)/config/sm6150auto.conf
+			export
+			INCS    +=  -include $(AUDIO_ROOT)/config/sm6150autoconf.h
+		endif
+		ifeq ($(CONFIG_ARCH_KONA), y)
+			include $(AUDIO_ROOT)/config/konaauto.conf
+			INCS    +=  -include $(AUDIO_ROOT)/config/konaautoconf.h
+		endif
+		ifeq ($(CONFIG_ARCH_LITO), y)
+			include $(AUDIO_ROOT)/config/litoauto.conf
+			export
+			INCS    +=  -include $(AUDIO_ROOT)/config/litoautoconf.h
+		endif
+		ifeq ($(CONFIG_ARCH_BENGAL), y)
+			include $(AUDIO_ROOT)/config/bengalauto.conf
+			export
+			INCS    +=  -include $(AUDIO_ROOT)/config/bengalautoconf.h
+		endif
+		ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
+			include $(AUDIO_ROOT)/config/sm8150auto.conf
+			export
+			INCS    +=  -include $(AUDIO_ROOT)/config/sm8150autoconf.h
+		endif
+		ifeq ($(CONFIG_ARCH_QCS405), y)
+			include $(AUDIO_ROOT)/config/qcs405auto.conf
+			export
+			INCS    +=  -include $(AUDIO_ROOT)/config/qcs405autoconf.h
+		endif
+		ifeq ($(CONFIG_QTI_QUIN_GVM), y)
+			include $(AUDIO_ROOT)/config/gvmauto.conf
+			export
+			INCS    +=  -include $(AUDIO_ROOT)/config/gvmautoconf.h
+		endif
+	endif
 endif
 
 # As per target team, build is done as follows:
diff --git a/config/gvmauto.conf b/config/gvmauto.conf
old mode 100644
new mode 100755
index 4597bf80ae34..a48bf2ebe193
--- a/config/gvmauto.conf
+++ b/config/gvmauto.conf
@@ -13,4 +13,4 @@ CONFIG_SND_SOC_MSM_STUB=m
 CONFIG_SND_SOC_MSM_HDMI_CODEC_RX=m
 CONFIG_MSM_QDSP6V2_CODECS=m
 CONFIG_SND_EVENT=m
-CONFIG_SND_SOC_SA8155=m
+CONFIG_SND_SOC_SA8155=m
\ No newline at end of file
diff --git a/dsp/Kbuild b/dsp/Kbuild
old mode 100644
new mode 100755
index 246f8ba643cd..a7eda3de2683
--- a/dsp/Kbuild
+++ b/dsp/Kbuild
@@ -24,71 +24,76 @@ ifeq ($(CONFIG_SND_SOC_AUTO), y)
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/sa6155autoconf.h
 	endif
-else
-ifeq ($(KERNEL_BUILD), 0)
-	ifeq ($(CONFIG_ARCH_SM6150), y)
-		ifdef CONFIG_SND_SOC_SA6155
-			include $(AUDIO_ROOT)/config/sa6155auto.conf
-			export
-			INCS    +=  -include $(AUDIO_ROOT)/config/sa6155autoconf.h
-		else
-			include $(AUDIO_ROOT)/config/sm6150auto.conf
-			export
-			INCS    +=  -include $(AUDIO_ROOT)/config/sm6150autoconf.h
-		endif
-	endif
-	ifeq ($(CONFIG_ARCH_TRINKET), y)
-		include $(AUDIO_ROOT)/config/sm6150auto.conf
-		export
-		INCS    +=  -include $(AUDIO_ROOT)/config/sm6150autoconf.h
-	endif
-	ifeq ($(CONFIG_ARCH_KONA), y)
-		include $(AUDIO_ROOT)/config/konaauto.conf
-		INCS    +=  -include $(AUDIO_ROOT)/config/konaautoconf.h
-	endif
-	ifeq ($(CONFIG_ARCH_LITO), y)
-		include $(AUDIO_ROOT)/config/litoauto.conf
-		export
-		INCS    +=  -include $(AUDIO_ROOT)/config/litoautoconf.h
-	endif
-	ifeq ($(CONFIG_ARCH_BENGAL), y)
-		include $(AUDIO_ROOT)/config/bengalauto.conf
-		export
-		INCS    +=  -include $(AUDIO_ROOT)/config/bengalautoconf.h
-	endif
-	ifeq ($(CONFIG_ARCH_SM8150), y)
-		ifdef CONFIG_SND_SOC_SA8155
-			include $(AUDIO_ROOT)/config/sa8155auto.conf
-			export
-			INCS    +=  -include $(AUDIO_ROOT)/config/sa8155autoconf.h
-		else
-			include $(AUDIO_ROOT)/config/sm8150auto.conf
-			export
-			INCS    +=  -include $(AUDIO_ROOT)/config/sm8150autoconf.h
-		endif
-	endif
-	ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
-		ifdef CONFIG_SND_SOC_SA8155
-			include $(AUDIO_ROOT)/config/sa8155auto.conf
-			export
-			INCS    +=  -include $(AUDIO_ROOT)/config/sa8155autoconf.h
-		else
-			include $(AUDIO_ROOT)/config/sm8150auto.conf
-			export
-			INCS    +=  -include $(AUDIO_ROOT)/config/sm8150autoconf.h
-		endif
-	endif
-	ifeq ($(CONFIG_ARCH_QCS405), y)
-		include $(AUDIO_ROOT)/config/qcs405auto.conf
-		export
-		INCS    +=  -include $(AUDIO_ROOT)/config/qcs405autoconf.h
-	endif
-	ifeq ($(CONFIG_QTI_QUIN_GVM), y)
+	ifdef CONFIG_SND_SOC_GVM
 		include $(AUDIO_ROOT)/config/gvmauto.conf
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/gvmautoconf.h
 	endif
-endif
+else
+	ifeq ($(KERNEL_BUILD), 0)
+		ifeq ($(CONFIG_ARCH_SM6150), y)
+			ifdef CONFIG_SND_SOC_SA6155
+				include $(AUDIO_ROOT)/config/sa6155auto.conf
+				export
+				INCS    +=  -include $(AUDIO_ROOT)/config/sa6155autoconf.h
+			else
+				include $(AUDIO_ROOT)/config/sm6150auto.conf
+				export
+				INCS    +=  -include $(AUDIO_ROOT)/config/sm6150autoconf.h
+			endif
+		endif
+		ifeq ($(CONFIG_ARCH_TRINKET), y)
+			include $(AUDIO_ROOT)/config/sm6150auto.conf
+			export
+			INCS    +=  -include $(AUDIO_ROOT)/config/sm6150autoconf.h
+		endif
+		ifeq ($(CONFIG_ARCH_KONA), y)
+			include $(AUDIO_ROOT)/config/konaauto.conf
+			INCS    +=  -include $(AUDIO_ROOT)/config/konaautoconf.h
+		endif
+		ifeq ($(CONFIG_ARCH_LITO), y)
+			include $(AUDIO_ROOT)/config/litoauto.conf
+			export
+			INCS    +=  -include $(AUDIO_ROOT)/config/litoautoconf.h
+		endif
+		ifeq ($(CONFIG_ARCH_BENGAL), y)
+			include $(AUDIO_ROOT)/config/bengalauto.conf
+			export
+			INCS    +=  -include $(AUDIO_ROOT)/config/bengalautoconf.h
+		endif
+		ifeq ($(CONFIG_ARCH_SM8150), y)
+			ifdef CONFIG_SND_SOC_SA8155
+				include $(AUDIO_ROOT)/config/sa8155auto.conf
+				export
+				INCS    +=  -include $(AUDIO_ROOT)/config/sa8155autoconf.h
+			else
+				include $(AUDIO_ROOT)/config/sm8150auto.conf
+				export
+				INCS    +=  -include $(AUDIO_ROOT)/config/sm8150autoconf.h
+			endif
+		endif
+		ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
+			ifdef CONFIG_SND_SOC_SA8155
+				include $(AUDIO_ROOT)/config/sa8155auto.conf
+				export
+				INCS    +=  -include $(AUDIO_ROOT)/config/sa8155autoconf.h
+			else
+				include $(AUDIO_ROOT)/config/sm8150auto.conf
+				export
+				INCS    +=  -include $(AUDIO_ROOT)/config/sm8150autoconf.h
+			endif
+		endif
+		ifeq ($(CONFIG_ARCH_QCS405), y)
+			include $(AUDIO_ROOT)/config/qcs405auto.conf
+			export
+			INCS    +=  -include $(AUDIO_ROOT)/config/qcs405autoconf.h
+		endif
+		ifeq ($(CONFIG_QTI_QUIN_GVM), y)
+			include $(AUDIO_ROOT)/config/gvmauto.conf
+			export
+			INCS    +=  -include $(AUDIO_ROOT)/config/gvmautoconf.h
+		endif
+	endif
 endif
 
 # As per target team, build is done as follows:
diff --git a/ipc/Kbuild b/ipc/Kbuild
old mode 100644
new mode 100755
index ead6dc0e2e42..a236ea7c0ce5
--- a/ipc/Kbuild
+++ b/ipc/Kbuild
@@ -25,71 +25,76 @@ ifeq ($(CONFIG_SND_SOC_AUTO), y)
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/sa6155autoconf.h
 	endif
-else
-ifeq ($(KERNEL_BUILD), 0)
-        ifeq ($(CONFIG_ARCH_SM6150), y)
-		ifdef CONFIG_SND_SOC_SA6155
-			include $(AUDIO_ROOT)/config/sa6155auto.conf
-			export
-			INCS    +=  -include $(AUDIO_ROOT)/config/sa6155autoconf.h
-		else
-			include $(AUDIO_ROOT)/config/sm6150auto.conf
-			export
-			INCS    +=  -include $(AUDIO_ROOT)/config/sm6150autoconf.h
-		endif
-        endif
-        ifeq ($(CONFIG_ARCH_TRINKET), y)
-                include $(AUDIO_ROOT)/config/sm6150auto.conf
-                export
-                INCS    +=  -include $(AUDIO_ROOT)/config/sm6150autoconf.h
-        endif
-	ifeq ($(CONFIG_ARCH_KONA), y)
-		include $(AUDIO_ROOT)/config/konaauto.conf
-		INCS    +=  -include $(AUDIO_ROOT)/config/konaautoconf.h
-	endif
-	ifeq ($(CONFIG_ARCH_LITO), y)
-		include $(AUDIO_ROOT)/config/litoauto.conf
-		export
-		INCS    +=  -include $(AUDIO_ROOT)/config/litoautoconf.h
-	endif
-	ifeq ($(CONFIG_ARCH_BENGAL), y)
-		include $(AUDIO_ROOT)/config/bengalauto.conf
-		export
-		INCS    +=  -include $(AUDIO_ROOT)/config/bengalautoconf.h
-	endif
-	ifeq ($(CONFIG_ARCH_SM8150), y)
-		ifdef CONFIG_SND_SOC_SA8155
-			include $(AUDIO_ROOT)/config/sa8155auto.conf
-			export
-			INCS    +=  -include $(AUDIO_ROOT)/config/sa8155autoconf.h
-		else
-			include $(AUDIO_ROOT)/config/sm8150auto.conf
-			export
-			INCS    +=  -include $(AUDIO_ROOT)/config/sm8150autoconf.h
-		endif
-	endif
-	ifeq ($(CONFIG_ARCH_QCS405), y)
-		include $(AUDIO_ROOT)/config/qcs405auto.conf
-		export
-		INCS    +=  -include $(AUDIO_ROOT)/config/qcs405autoconf.h
-	endif
-	ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
-		ifdef CONFIG_SND_SOC_SA8155
-			include $(AUDIO_ROOT)/config/sa8155auto.conf
-			export
-			INCS    +=  -include $(AUDIO_ROOT)/config/sa8155autoconf.h
-		else
-			include $(AUDIO_ROOT)/config/sm8150auto.conf
-			export
-			INCS    +=  -include $(AUDIO_ROOT)/config/sm8150autoconf.h
-		endif
-	endif
-	ifeq ($(CONFIG_QTI_QUIN_GVM), y)
+	ifdef CONFIG_SND_SOC_GVM
 		include $(AUDIO_ROOT)/config/gvmauto.conf
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/gvmautoconf.h
 	endif
-endif
+else
+	ifeq ($(KERNEL_BUILD), 0)
+			ifeq ($(CONFIG_ARCH_SM6150), y)
+			ifdef CONFIG_SND_SOC_SA6155
+				include $(AUDIO_ROOT)/config/sa6155auto.conf
+				export
+				INCS    +=  -include $(AUDIO_ROOT)/config/sa6155autoconf.h
+			else
+				include $(AUDIO_ROOT)/config/sm6150auto.conf
+				export
+				INCS    +=  -include $(AUDIO_ROOT)/config/sm6150autoconf.h
+			endif
+			endif
+			ifeq ($(CONFIG_ARCH_TRINKET), y)
+					include $(AUDIO_ROOT)/config/sm6150auto.conf
+					export
+					INCS    +=  -include $(AUDIO_ROOT)/config/sm6150autoconf.h
+			endif
+		ifeq ($(CONFIG_ARCH_KONA), y)
+			include $(AUDIO_ROOT)/config/konaauto.conf
+			INCS    +=  -include $(AUDIO_ROOT)/config/konaautoconf.h
+		endif
+		ifeq ($(CONFIG_ARCH_LITO), y)
+			include $(AUDIO_ROOT)/config/litoauto.conf
+			export
+			INCS    +=  -include $(AUDIO_ROOT)/config/litoautoconf.h
+		endif
+		ifeq ($(CONFIG_ARCH_BENGAL), y)
+			include $(AUDIO_ROOT)/config/bengalauto.conf
+			export
+			INCS    +=  -include $(AUDIO_ROOT)/config/bengalautoconf.h
+		endif
+		ifeq ($(CONFIG_ARCH_SM8150), y)
+			ifdef CONFIG_SND_SOC_SA8155
+				include $(AUDIO_ROOT)/config/sa8155auto.conf
+				export
+				INCS    +=  -include $(AUDIO_ROOT)/config/sa8155autoconf.h
+			else
+				include $(AUDIO_ROOT)/config/sm8150auto.conf
+				export
+				INCS    +=  -include $(AUDIO_ROOT)/config/sm8150autoconf.h
+			endif
+		endif
+		ifeq ($(CONFIG_ARCH_QCS405), y)
+			include $(AUDIO_ROOT)/config/qcs405auto.conf
+			export
+			INCS    +=  -include $(AUDIO_ROOT)/config/qcs405autoconf.h
+		endif
+		ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
+			ifdef CONFIG_SND_SOC_SA8155
+				include $(AUDIO_ROOT)/config/sa8155auto.conf
+				export
+				INCS    +=  -include $(AUDIO_ROOT)/config/sa8155autoconf.h
+			else
+				include $(AUDIO_ROOT)/config/sm8150auto.conf
+				export
+				INCS    +=  -include $(AUDIO_ROOT)/config/sm8150autoconf.h
+			endif
+		endif
+		ifeq ($(CONFIG_QTI_QUIN_GVM), y)
+			include $(AUDIO_ROOT)/config/gvmauto.conf
+			export
+			INCS    +=  -include $(AUDIO_ROOT)/config/gvmautoconf.h
+		endif
+	endif
 endif
 
 # As per target team, build is done as follows:
diff --git a/soc/Kbuild b/soc/Kbuild
old mode 100644
new mode 100755
index b8f2d9366f44..730c8a3ee5c7
--- a/soc/Kbuild
+++ b/soc/Kbuild
@@ -24,71 +24,76 @@ ifeq ($(CONFIG_SND_SOC_AUTO), y)
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/sa6155autoconf.h
 	endif
-else
-ifeq ($(KERNEL_BUILD), 0)
-	ifeq ($(CONFIG_ARCH_SM8150), y)
-		ifdef CONFIG_SND_SOC_SA8155
-			include $(AUDIO_ROOT)/config/sa8155auto.conf
-			export
-			INCS    +=  -include $(AUDIO_ROOT)/config/sa8155autoconf.h
-		else
-			include $(AUDIO_ROOT)/config/sm8150auto.conf
-			export
-			INCS    +=  -include $(AUDIO_ROOT)/config/sm8150autoconf.h
-		endif
-	endif
-	ifeq ($(CONFIG_ARCH_KONA), y)
-		include $(AUDIO_ROOT)/config/konaauto.conf
-		INCS    +=  -include $(AUDIO_ROOT)/config/konaautoconf.h
-	endif
-	ifeq ($(CONFIG_ARCH_LITO), y)
-		include $(AUDIO_ROOT)/config/litoauto.conf
-		export
-		INCS    +=  -include $(AUDIO_ROOT)/config/litoautoconf.h
-	endif
-	ifeq ($(CONFIG_ARCH_BENGAL), y)
-		include $(AUDIO_ROOT)/config/bengalauto.conf
-		export
-		INCS    +=  -include $(AUDIO_ROOT)/config/bengalautoconf.h
-	endif
-	ifeq ($(CONFIG_ARCH_SM6150), y)
-		ifdef CONFIG_SND_SOC_SA6155
-			include $(AUDIO_ROOT)/config/sa6155auto.conf
-			export
-			INCS    +=  -include $(AUDIO_ROOT)/config/sa6155autoconf.h
-		else
-			include $(AUDIO_ROOT)/config/sm6150auto.conf
-			export
-			INCS    +=  -include $(AUDIO_ROOT)/config/sm6150autoconf.h
-		endif
-	endif
-	ifeq ($(CONFIG_ARCH_TRINKET), y)
-		include $(AUDIO_ROOT)/config/sm6150auto.conf
-		export
-		INCS    +=  -include $(AUDIO_ROOT)/config/sm6150autoconf.h
-	endif
-	ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
-		ifdef CONFIG_SND_SOC_SA8155
-			include $(AUDIO_ROOT)/config/sa8155auto.conf
-			export
-			INCS    +=  -include $(AUDIO_ROOT)/config/sa8155autoconf.h
-		else
-			include $(AUDIO_ROOT)/config/sm8150auto.conf
-			export
-			INCS    +=  -include $(AUDIO_ROOT)/config/sm8150autoconf.h
-		endif
-	endif
-	ifeq ($(CONFIG_ARCH_QCS405), y)
-		include $(AUDIO_ROOT)/config/qcs405auto.conf
-		export
-		INCS    +=  -include $(AUDIO_ROOT)/config/qcs405autoconf.h
-	endif
-	ifeq ($(CONFIG_QTI_QUIN_GVM), y)
+	ifdef CONFIG_SND_SOC_GVM
 		include $(AUDIO_ROOT)/config/gvmauto.conf
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/gvmautoconf.h
 	endif
-endif
+else
+	ifeq ($(KERNEL_BUILD), 0)
+		ifeq ($(CONFIG_ARCH_SM8150), y)
+			ifdef CONFIG_SND_SOC_SA8155
+				include $(AUDIO_ROOT)/config/sa8155auto.conf
+				export
+				INCS    +=  -include $(AUDIO_ROOT)/config/sa8155autoconf.h
+			else
+				include $(AUDIO_ROOT)/config/sm8150auto.conf
+				export
+				INCS    +=  -include $(AUDIO_ROOT)/config/sm8150autoconf.h
+			endif
+		endif
+		ifeq ($(CONFIG_ARCH_KONA), y)
+			include $(AUDIO_ROOT)/config/konaauto.conf
+			INCS    +=  -include $(AUDIO_ROOT)/config/konaautoconf.h
+		endif
+		ifeq ($(CONFIG_ARCH_LITO), y)
+			include $(AUDIO_ROOT)/config/litoauto.conf
+			export
+			INCS    +=  -include $(AUDIO_ROOT)/config/litoautoconf.h
+		endif
+		ifeq ($(CONFIG_ARCH_BENGAL), y)
+			include $(AUDIO_ROOT)/config/bengalauto.conf
+			export
+			INCS    +=  -include $(AUDIO_ROOT)/config/bengalautoconf.h
+		endif
+		ifeq ($(CONFIG_ARCH_SM6150), y)
+			ifdef CONFIG_SND_SOC_SA6155
+				include $(AUDIO_ROOT)/config/sa6155auto.conf
+				export
+				INCS    +=  -include $(AUDIO_ROOT)/config/sa6155autoconf.h
+			else
+				include $(AUDIO_ROOT)/config/sm6150auto.conf
+				export
+				INCS    +=  -include $(AUDIO_ROOT)/config/sm6150autoconf.h
+			endif
+		endif
+		ifeq ($(CONFIG_ARCH_TRINKET), y)
+			include $(AUDIO_ROOT)/config/sm6150auto.conf
+			export
+			INCS    +=  -include $(AUDIO_ROOT)/config/sm6150autoconf.h
+		endif
+		ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
+			ifdef CONFIG_SND_SOC_SA8155
+				include $(AUDIO_ROOT)/config/sa8155auto.conf
+				export
+				INCS    +=  -include $(AUDIO_ROOT)/config/sa8155autoconf.h
+			else
+				include $(AUDIO_ROOT)/config/sm8150auto.conf
+				export
+				INCS    +=  -include $(AUDIO_ROOT)/config/sm8150autoconf.h
+			endif
+		endif
+		ifeq ($(CONFIG_ARCH_QCS405), y)
+			include $(AUDIO_ROOT)/config/qcs405auto.conf
+			export
+			INCS    +=  -include $(AUDIO_ROOT)/config/qcs405autoconf.h
+		endif
+		ifeq ($(CONFIG_QTI_QUIN_GVM), y)
+			include $(AUDIO_ROOT)/config/gvmauto.conf
+			export
+			INCS    +=  -include $(AUDIO_ROOT)/config/gvmautoconf.h
+		endif
+	endif
 endif
 
 # As per target team, build is done as follows: