From 6d6529a69438d0823e81fedae2a7cce10cde89d8 Mon Sep 17 00:00:00 2001
From: Guodong Hu <guodhu@codeaurora.org>
Date: Thu, 13 Aug 2020 10:11:45 +0800
Subject: [PATCH] dsp/ipc: update kbuild and header files for gvm bringup

Update Kbuild and header files in msm_audio_ion_vm.c
and apr_vm.c for kernel 5.4 gvm audio bring up.

Change-Id: I6bcd0e49f783aaec43a64ad308b817a474b30dc7
Signed-off-by: Guodong Hu <guodhu@codeaurora.org>
---
 Makefile               | 8 ++++++++
 asoc/Kbuild            | 2 +-
 asoc/codecs/Kbuild     | 2 +-
 config/gvmauto.conf    | 1 +
 config/gvmautoconf.h   | 1 +
 dsp/Kbuild             | 2 +-
 dsp/codecs/Kbuild      | 2 +-
 dsp/msm_audio_ion_vm.c | 3 +--
 ipc/Kbuild             | 2 +-
 ipc/apr_vm.c           | 1 -
 soc/Kbuild             | 2 +-
 11 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 1d16c10993..f700f9f3df 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,9 @@
 # auto-detect subdirs
 ifneq ($(CONFIG_ARCH_QTI_VM), y)
+ifeq ($(CONFIG_QTI_QUIN_GVM), y)
+include $(srctree)/techpack/audio/config/gvmauto.conf
+export
+endif
 ifeq ($(CONFIG_ARCH_SDXPOORWILLS), y)
 include $(srctree)/techpack/audio/config/sdxpoorwillsauto.conf
 export
@@ -34,6 +38,10 @@ LINUXINCLUDE    += \
                 -I$(srctree)/techpack/audio/include/uapi/audio \
                 -I$(srctree)/techpack/audio/include
 
+ifeq ($(CONFIG_QTI_QUIN_GVM), y)
+LINUXINCLUDE    += \
+                -include $(srctree)/techpack/audio/config/gvmautoconf.h
+endif
 ifeq ($(CONFIG_ARCH_SDXPOORWILLS), y)
 LINUXINCLUDE    += \
                 -include $(srctree)/techpack/audio/config/sdxpoorwillsautoconf.h
diff --git a/asoc/Kbuild b/asoc/Kbuild
index 1b8c3668bb..2f9bc2a794 100644
--- a/asoc/Kbuild
+++ b/asoc/Kbuild
@@ -71,7 +71,7 @@ ifeq ($(KERNEL_BUILD), 0)
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/qcs405autoconf.h
 	endif
-	ifeq ($(CONFIG_QTI_GVM), y)
+	ifeq ($(CONFIG_QTI_QUIN_GVM), y)
 		include $(AUDIO_ROOT)/config/gvmauto.conf
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/gvmautoconf.h
diff --git a/asoc/codecs/Kbuild b/asoc/codecs/Kbuild
index 4376af1e2d..f4d0c735b0 100644
--- a/asoc/codecs/Kbuild
+++ b/asoc/codecs/Kbuild
@@ -65,7 +65,7 @@ ifeq ($(KERNEL_BUILD), 0)
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/qcs405autoconf.h
 	endif
-	ifeq ($(CONFIG_QTI_GVM), y)
+	ifeq ($(CONFIG_QTI_QUIN_GVM), y)
 		include $(AUDIO_ROOT)/config/gvmauto.conf
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/gvmautoconf.h
diff --git a/config/gvmauto.conf b/config/gvmauto.conf
index 35b70b9f5e..4597bf80ae 100644
--- a/config/gvmauto.conf
+++ b/config/gvmauto.conf
@@ -13,3 +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
diff --git a/config/gvmautoconf.h b/config/gvmautoconf.h
index 84a8f1df7c..2feb744f9a 100644
--- a/config/gvmautoconf.h
+++ b/config/gvmautoconf.h
@@ -25,3 +25,4 @@
 #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 f01337cf23..4ecc93f355 100644
--- a/dsp/Kbuild
+++ b/dsp/Kbuild
@@ -71,7 +71,7 @@ ifeq ($(KERNEL_BUILD), 0)
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/qcs405autoconf.h
 	endif
-	ifeq ($(CONFIG_QTI_GVM), y)
+	ifeq ($(CONFIG_QTI_QUIN_GVM), y)
 		include $(AUDIO_ROOT)/config/gvmauto.conf
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/gvmautoconf.h
diff --git a/dsp/codecs/Kbuild b/dsp/codecs/Kbuild
index 4c648da12f..68b05ffacc 100644
--- a/dsp/codecs/Kbuild
+++ b/dsp/codecs/Kbuild
@@ -53,7 +53,7 @@ ifeq ($(KERNEL_BUILD), 0)
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/qcs405autoconf.h
 	endif
-	ifeq ($(CONFIG_QTI_GVM), y)
+	ifeq ($(CONFIG_QTI_QUIN_GVM), y)
 		include $(AUDIO_ROOT)/config/gvmauto.conf
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/gvmautoconf.h
diff --git a/dsp/msm_audio_ion_vm.c b/dsp/msm_audio_ion_vm.c
index 37b17b6856..da391c611d 100644
--- a/dsp/msm_audio_ion_vm.c
+++ b/dsp/msm_audio_ion_vm.c
@@ -18,9 +18,8 @@
 #include <linux/platform_device.h>
 #include <linux/of_device.h>
 #include <linux/export.h>
-#include <linux/ion_kernel.h>
+#include <linux/ion.h>
 #include <ipc/apr.h>
-#include <asm/dma-iommu.h>
 #include <dsp/msm_audio_ion.h>
 #include <soc/qcom/secure_buffer.h>
 #include <linux/habmm.h>
diff --git a/ipc/Kbuild b/ipc/Kbuild
index 00a71683d5..68d26d52fb 100644
--- a/ipc/Kbuild
+++ b/ipc/Kbuild
@@ -72,7 +72,7 @@ ifeq ($(KERNEL_BUILD), 0)
 			INCS    +=  -include $(AUDIO_ROOT)/config/sm8150autoconf.h
 		endif
 	endif
-	ifeq ($(CONFIG_QTI_GVM), y)
+	ifeq ($(CONFIG_QTI_QUIN_GVM), y)
 		include $(AUDIO_ROOT)/config/gvmauto.conf
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/gvmautoconf.h
diff --git a/ipc/apr_vm.c b/ipc/apr_vm.c
index f8e2b588a7..ccd5ada353 100644
--- a/ipc/apr_vm.c
+++ b/ipc/apr_vm.c
@@ -23,7 +23,6 @@
 #include <linux/ipc_logging.h>
 #include <linux/of_platform.h>
 #include <soc/qcom/subsystem_restart.h>
-#include <soc/qcom/scm.h>
 #include <soc/snd_event.h>
 #include <dsp/apr_audio-v2.h>
 #include <dsp/audio_notifier.h>
diff --git a/soc/Kbuild b/soc/Kbuild
index 10f761ed65..bc57f39666 100644
--- a/soc/Kbuild
+++ b/soc/Kbuild
@@ -71,7 +71,7 @@ ifeq ($(KERNEL_BUILD), 0)
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/qcs405autoconf.h
 	endif
-	ifeq ($(CONFIG_QTI_GVM), y)
+	ifeq ($(CONFIG_QTI_QUIN_GVM), y)
 		include $(AUDIO_ROOT)/config/gvmauto.conf
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/gvmautoconf.h