From c397018921c7aae08755dcdd0dd0f6c2ebe7b5d9 Mon Sep 17 00:00:00 2001 From: Tahir Dawson Date: Fri, 11 Sep 2020 18:27:45 -0400 Subject: [PATCH] audio-kernel: include sa8155 config Change-Id: Icceeafc2a6d0996e39a05f39246aaf3f5e99404f Signed-off-by: Deru Wang Signed-off-by: Tahir Dawson --- Makefile | 9 ++++++++- config/sa8155auto.conf | 1 + config/sa8155autoconf.h | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f700f9f3df744..a74d1c6eacc2e 100644 --- a/Makefile +++ b/Makefile @@ -25,8 +25,11 @@ endif ifeq ($(CONFIG_ARCH_HOLI), y) include $(srctree)/techpack/audio/config/holiauto.conf endif +ifeq ($(CONFIG_ARCH_SA8155), y) +include $(srctree)/techpack/audio/config/sa8155auto.conf +export +endif endif - # Use USERINCLUDE when you must reference the UAPI directories only. USERINCLUDE += \ -I$(srctree)/techpack/audio/include/uapi/audio @@ -66,6 +69,10 @@ ifeq ($(CONFIG_ARCH_HOLI), y) LINUXINCLUDE += \ -include $(srctree)/techpack/audio/config/holiautoconf.h endif +ifeq ($(CONFIG_ARCH_SA8155), y) +LINUXINCLUDE += \ + -include $(srctree)/techpack/audio/config/sa8155autoconf.h +endif obj-y += soc/ obj-y += dsp/ diff --git a/config/sa8155auto.conf b/config/sa8155auto.conf index bf5b9cdae15aa..e6506760a4d05 100644 --- a/config/sa8155auto.conf +++ b/config/sa8155auto.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/sa8155autoconf.h b/config/sa8155autoconf.h index 167451639a1e6..7470fc6b5cd21 100644 --- a/config/sa8155autoconf.h +++ b/config/sa8155autoconf.h @@ -17,3 +17,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