samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "dsp/ipc: update kbuild and header files for gvm bringup"

Browse Source
This commit is contained in:
qctecmdr
2020-09-03 18:06:22 -07:00
committed by Gerrit - the friendly Code Review server
parent f56b14ef39 6d6529a694
commit 3c36eede88
11 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@@ -1,5 +1,9 @@
# auto-detect subdirs # auto-detect subdirs
ifneq ($(CONFIG_ARCH_QTI_VM), y) 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) ifeq ($(CONFIG_ARCH_SDXPOORWILLS), y)
include $(srctree)/techpack/audio/config/sdxpoorwillsauto.conf include $(srctree)/techpack/audio/config/sdxpoorwillsauto.conf
export export
@@ -34,6 +38,10 @@ LINUXINCLUDE += \
-I$(srctree)/techpack/audio/include/uapi/audio \ -I$(srctree)/techpack/audio/include/uapi/audio \
-I$(srctree)/techpack/audio/include -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) ifeq ($(CONFIG_ARCH_SDXPOORWILLS), y)
LINUXINCLUDE += \ LINUXINCLUDE += \
-include $(srctree)/techpack/audio/config/sdxpoorwillsautoconf.h -include $(srctree)/techpack/audio/config/sdxpoorwillsautoconf.h

2
asoc/Kbuild
View File

@@ -71,7 +71,7 @@ ifeq ($(KERNEL_BUILD), 0)
export export
INCS += -include $(AUDIO_ROOT)/config/qcs405autoconf.h INCS += -include $(AUDIO_ROOT)/config/qcs405autoconf.h
endif endif
ifeq ($(CONFIG_QTI_GVM), y) ifeq ($(CONFIG_QTI_QUIN_GVM), y)
include $(AUDIO_ROOT)/config/gvmauto.conf include $(AUDIO_ROOT)/config/gvmauto.conf
export export
INCS += -include $(AUDIO_ROOT)/config/gvmautoconf.h INCS += -include $(AUDIO_ROOT)/config/gvmautoconf.h

2
asoc/codecs/Kbuild
View File

@@ -65,7 +65,7 @@ ifeq ($(KERNEL_BUILD), 0)
export export
INCS += -include $(AUDIO_ROOT)/config/qcs405autoconf.h INCS += -include $(AUDIO_ROOT)/config/qcs405autoconf.h
endif endif
ifeq ($(CONFIG_QTI_GVM), y) ifeq ($(CONFIG_QTI_QUIN_GVM), y)
include $(AUDIO_ROOT)/config/gvmauto.conf include $(AUDIO_ROOT)/config/gvmauto.conf
export export
INCS += -include $(AUDIO_ROOT)/config/gvmautoconf.h INCS += -include $(AUDIO_ROOT)/config/gvmautoconf.h

1
config/gvmauto.conf
View File

@@ -13,3 +13,4 @@ CONFIG_SND_SOC_MSM_STUB=m
CONFIG_SND_SOC_MSM_HDMI_CODEC_RX=m CONFIG_SND_SOC_MSM_HDMI_CODEC_RX=m
CONFIG_MSM_QDSP6V2_CODECS=m CONFIG_MSM_QDSP6V2_CODECS=m
CONFIG_SND_EVENT=m CONFIG_SND_EVENT=m
CONFIG_SND_SOC_SA8155=m

1
config/gvmautoconf.h
View File

@@ -25,3 +25,4 @@
#define CONFIG_SND_SOC_MSM_HDMI_CODEC_RX 1 #define CONFIG_SND_SOC_MSM_HDMI_CODEC_RX 1
#define CONFIG_MSM_QDSP6V2_CODECS 1 #define CONFIG_MSM_QDSP6V2_CODECS 1
#define CONFIG_SND_EVENT 1 #define CONFIG_SND_EVENT 1
#define CONFIG_SND_SOC_SA8155 1

2
dsp/Kbuild
View File

@@ -71,7 +71,7 @@ ifeq ($(KERNEL_BUILD), 0)
export export
INCS += -include $(AUDIO_ROOT)/config/qcs405autoconf.h INCS += -include $(AUDIO_ROOT)/config/qcs405autoconf.h
endif endif
ifeq ($(CONFIG_QTI_GVM), y) ifeq ($(CONFIG_QTI_QUIN_GVM), y)
include $(AUDIO_ROOT)/config/gvmauto.conf include $(AUDIO_ROOT)/config/gvmauto.conf
export export
INCS += -include $(AUDIO_ROOT)/config/gvmautoconf.h INCS += -include $(AUDIO_ROOT)/config/gvmautoconf.h

2
dsp/codecs/Kbuild
View File

@@ -53,7 +53,7 @@ ifeq ($(KERNEL_BUILD), 0)
export export
INCS += -include $(AUDIO_ROOT)/config/qcs405autoconf.h INCS += -include $(AUDIO_ROOT)/config/qcs405autoconf.h
endif endif
ifeq ($(CONFIG_QTI_GVM), y) ifeq ($(CONFIG_QTI_QUIN_GVM), y)
include $(AUDIO_ROOT)/config/gvmauto.conf include $(AUDIO_ROOT)/config/gvmauto.conf
export export
INCS += -include $(AUDIO_ROOT)/config/gvmautoconf.h INCS += -include $(AUDIO_ROOT)/config/gvmautoconf.h

3
dsp/msm_audio_ion_vm.c
View File

@@ -18,9 +18,8 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/export.h> #include <linux/export.h>
#include <linux/ion_kernel.h> #include <linux/ion.h>
#include <ipc/apr.h> #include <ipc/apr.h>
#include <asm/dma-iommu.h>
#include <dsp/msm_audio_ion.h> #include <dsp/msm_audio_ion.h>
#include <soc/qcom/secure_buffer.h> #include <soc/qcom/secure_buffer.h>
#include <linux/habmm.h> #include <linux/habmm.h>

2
ipc/Kbuild
View File

@@ -72,7 +72,7 @@ ifeq ($(KERNEL_BUILD), 0)
INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
endif endif
endif endif
ifeq ($(CONFIG_QTI_GVM), y) ifeq ($(CONFIG_QTI_QUIN_GVM), y)
include $(AUDIO_ROOT)/config/gvmauto.conf include $(AUDIO_ROOT)/config/gvmauto.conf
export export
INCS += -include $(AUDIO_ROOT)/config/gvmautoconf.h INCS += -include $(AUDIO_ROOT)/config/gvmautoconf.h

1
ipc/apr_vm.c
View File

@@ -23,7 +23,6 @@
#include <linux/ipc_logging.h> #include <linux/ipc_logging.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <soc/qcom/subsystem_restart.h> #include <soc/qcom/subsystem_restart.h>
#include <soc/qcom/scm.h>
#include <soc/snd_event.h> #include <soc/snd_event.h>
#include <dsp/apr_audio-v2.h> #include <dsp/apr_audio-v2.h>
#include <dsp/audio_notifier.h> #include <dsp/audio_notifier.h>

2
soc/Kbuild
View File

@@ -71,7 +71,7 @@ ifeq ($(KERNEL_BUILD), 0)
export export
INCS += -include $(AUDIO_ROOT)/config/qcs405autoconf.h INCS += -include $(AUDIO_ROOT)/config/qcs405autoconf.h
endif endif
ifeq ($(CONFIG_QTI_GVM), y) ifeq ($(CONFIG_QTI_QUIN_GVM), y)
include $(AUDIO_ROOT)/config/gvmauto.conf include $(AUDIO_ROOT)/config/gvmauto.conf
export export
INCS += -include $(AUDIO_ROOT)/config/gvmautoconf.h INCS += -include $(AUDIO_ROOT)/config/gvmautoconf.h