From 00f60bae1e675a12c4179203001d4a70b99fb87a Mon Sep 17 00:00:00 2001 From: Laxminath Kasam Date: Fri, 4 Oct 2019 09:37:07 +0530 Subject: [PATCH] bengal: enable compile of required modules Update compile of required modules for bengal target. Change-Id: If4d512b7270cc811a05524caac5292234a0ac437 Signed-off-by: Laxminath Kasam --- Android.mk | 4 ++-- asoc/Android.mk | 5 +++++ asoc/Kbuild | 12 +++++++++-- asoc/codecs/Android.mk | 18 ++++++++++++++++ asoc/codecs/Kbuild | 13 ++++++++++-- asoc/codecs/bolero/Android.mk | 6 ++++++ asoc/codecs/bolero/Kbuild | 4 ++-- asoc/codecs/wcd937x/Android.mk | 6 +++++- asoc/codecs/wcd937x/Kbuild | 5 +++++ asoc/codecs/wcd938x/Android.mk | 2 +- asoc/codecs/wcd938x/Kbuild | 5 ----- config/bengalauto.conf | 34 ++++++++++++++++++++++++++++++ config/bengalautoconf.h | 38 ++++++++++++++++++++++++++++++++++ dsp/Android.mk | 4 ++++ dsp/Kbuild | 4 ++-- dsp/codecs/Android.mk | 4 ++++ dsp/codecs/Kbuild | 4 ++-- ipc/Android.mk | 4 ++++ ipc/Kbuild | 4 ++-- soc/Android.mk | 8 +++++-- soc/Kbuild | 4 ++-- 21 files changed, 163 insertions(+), 25 deletions(-) create mode 100644 config/bengalauto.conf create mode 100644 config/bengalautoconf.h diff --git a/Android.mk b/Android.mk index feead0106a6c..cac738852a87 100644 --- a/Android.mk +++ b/Android.mk @@ -38,7 +38,7 @@ include $(MY_LOCAL_PATH)/asoc/codecs/aqt1000/Android.mk endif endif -ifeq ($(call is-board-platform-in-list,$(MSMSTEPPE) $(TRINKET)),true) +ifeq ($(call is-board-platform-in-list,$(MSMSTEPPE) $(TRINKET) bengal),true) ifneq ($(TARGET_BOARD_AUTO),true) $(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/bolero/Module.symvers) include $(MY_LOCAL_PATH)/asoc/codecs/bolero/Android.mk @@ -47,7 +47,7 @@ include $(MY_LOCAL_PATH)/asoc/codecs/wcd937x/Android.mk endif endif -ifeq ($(call is-board-platform-in-list, kona lito bengal),true) +ifeq ($(call is-board-platform-in-list, kona lito),true) $(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/bolero/Module.symvers) include $(MY_LOCAL_PATH)/asoc/codecs/bolero/Android.mk $(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/wcd938x/Module.symvers) diff --git a/asoc/Android.mk b/asoc/Android.mk index 4431f887e0a3..4ce1fa77d4ab 100644 --- a/asoc/Android.mk +++ b/asoc/Android.mk @@ -36,6 +36,11 @@ TARGET := lito AUDIO_SELECT := CONFIG_SND_SOC_LITO=m endif +ifeq ($(call is-board-platform,bengal),true) +TARGET := bengal +AUDIO_SELECT := CONFIG_SND_SOC_BENGAL=m +endif + AUDIO_CHIPSET := audio # Build/Package only in case of supported target ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE) $(TRINKET) kona lito bengal sdmshrike),true) diff --git a/asoc/Kbuild b/asoc/Kbuild index 9e455a99314a..137fd60f8841 100644 --- a/asoc/Kbuild +++ b/asoc/Kbuild @@ -51,9 +51,9 @@ ifeq ($(KERNEL_BUILD), 0) INCS += -include $(AUDIO_ROOT)/config/litoautoconf.h endif ifeq ($(CONFIG_ARCH_BENGAL), y) - include $(AUDIO_ROOT)/config/litoauto.conf + include $(AUDIO_ROOT)/config/bengalauto.conf export - INCS += -include $(AUDIO_ROOT)/config/litoautoconf.h + INCS += -include $(AUDIO_ROOT)/config/bengalautoconf.h endif ifeq ($(CONFIG_ARCH_SDMSHRIKE), y) ifdef CONFIG_SND_SOC_SA8155 @@ -135,6 +135,11 @@ ifdef CONFIG_SND_SOC_LITO MACHINE_OBJS += kona.o endif +# for BENGAL sound card driver +ifdef CONFIG_SND_SOC_BENGAL + MACHINE_OBJS += bengal.o +endif + # for sa8155 sound card driver ifdef CONFIG_SND_SOC_SA8155 MACHINE_OBJS += sa8155.o @@ -244,6 +249,9 @@ machine_dlkm-y := $(MACHINE_OBJS) obj-$(CONFIG_SND_SOC_LITO) += machine_dlkm.o machine_dlkm-y := $(MACHINE_OBJS) +obj-$(CONFIG_SND_SOC_BENGAL) += machine_dlkm.o +machine_dlkm-y := $(MACHINE_OBJS) + obj-$(CONFIG_SND_SOC_SA8155) += machine_dlkm.o machine_dlkm-y := $(MACHINE_OBJS) diff --git a/asoc/codecs/Android.mk b/asoc/codecs/Android.mk index fb00efb70163..da39e8c8139d 100644 --- a/asoc/codecs/Android.mk +++ b/asoc/codecs/Android.mk @@ -31,6 +31,10 @@ ifeq ($(call is-board-platform,lito),true) AUDIO_SELECT := CONFIG_SND_SOC_LITO=m endif +ifeq ($(call is-board-platform,bengal),true) +AUDIO_SELECT := CONFIG_SND_SOC_BENGAL=m +endif + AUDIO_CHIPSET := audio # Build/Package only in case of supported target ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE) $(TRINKET) kona lito bengal sdmshrike),true) @@ -107,6 +111,7 @@ LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) include $(DLKM_DIR)/AndroidKernelModule.mk endif ########################################################### +ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), bengal)) include $(CLEAR_VARS) LOCAL_MODULE := $(AUDIO_CHIPSET)_wsa881x.ko LOCAL_MODULE_KBUILD_NAME := wsa881x_dlkm.ko @@ -114,6 +119,17 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE_DEBUG_ENABLE := true LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) include $(DLKM_DIR)/AndroidKernelModule.mk +endif +########################################################### +ifeq ($(call is-board-platform-in-list, bengal),true) +include $(CLEAR_VARS) +LOCAL_MODULE := $(AUDIO_CHIPSET)_wsa881x_analog.ko +LOCAL_MODULE_KBUILD_NAME := wsa881x_analog_dlkm.ko +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_DEBUG_ENABLE := true +LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) +include $(DLKM_DIR)/AndroidKernelModule.mk +endif ########################################################### include $(CLEAR_VARS) LOCAL_MODULE := $(AUDIO_CHIPSET)_mbhc.ko @@ -132,6 +148,7 @@ LOCAL_MODULE_DEBUG_ENABLE := true LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) include $(DLKM_DIR)/AndroidKernelModule.mk ########################################################### +ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), bengal)) include $(CLEAR_VARS) LOCAL_MODULE := $(AUDIO_CHIPSET)_hdmi.ko LOCAL_MODULE_KBUILD_NAME := hdmi_dlkm.ko @@ -139,6 +156,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE_DEBUG_ENABLE := true LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) include $(DLKM_DIR)/AndroidKernelModule.mk +endif ########################################################### endif # DLKM check diff --git a/asoc/codecs/Kbuild b/asoc/codecs/Kbuild index b8abfc4ca897..1ce059ec7012 100644 --- a/asoc/codecs/Kbuild +++ b/asoc/codecs/Kbuild @@ -51,9 +51,9 @@ ifeq ($(KERNEL_BUILD), 0) INCS += -include $(AUDIO_ROOT)/config/litoautoconf.h endif ifeq ($(CONFIG_ARCH_BENGAL), y) - include $(AUDIO_ROOT)/config/litoauto.conf + include $(AUDIO_ROOT)/config/bengalauto.conf export - INCS += -include $(AUDIO_ROOT)/config/litoautoconf.h + INCS += -include $(AUDIO_ROOT)/config/bengalautoconf.h endif ifeq ($(CONFIG_ARCH_SDMSHRIKE), y) include $(AUDIO_ROOT)/config/sm8150auto.conf @@ -143,6 +143,12 @@ ifdef CONFIG_SND_SOC_WSA881X WSA881X_OBJS += wsa881x-temp-sensor.o endif +ifdef CONFIG_SND_SOC_WSA881X_ANALOG + WSA881X_ANALOG_OBJS += wsa881x-analog.o + WSA881X_ANALOG_OBJS += wsa881x-tables-analog.o + WSA881X_ANALOG_OBJS += wsa881x-regmap-analog.o + WSA881X_ANALOG_OBJS += wsa881x-temp-sensor.o +endif ifdef CONFIG_SND_SOC_MSM_STUB STUB_OBJS += msm_stub.o endif @@ -235,6 +241,9 @@ wcd9335_dlkm-y := $(WCD9335_OBJS) obj-$(CONFIG_SND_SOC_WSA881X) += wsa881x_dlkm.o wsa881x_dlkm-y := $(WSA881X_OBJS) +obj-$(CONFIG_SND_SOC_WSA881X_ANALOG) += wsa881x_analog_dlkm.o +wsa881x_analog_dlkm-y := $(WSA881X_ANALOG_OBJS) + obj-$(CONFIG_SND_SOC_MSM_STUB) += stub_dlkm.o stub_dlkm-y := $(STUB_OBJS) diff --git a/asoc/codecs/bolero/Android.mk b/asoc/codecs/bolero/Android.mk index 9d1274f8e6dc..5764412ed006 100644 --- a/asoc/codecs/bolero/Android.mk +++ b/asoc/codecs/bolero/Android.mk @@ -15,6 +15,10 @@ ifeq ($(call is-board-platform,lito),true) AUDIO_SELECT := CONFIG_SND_SOC_LITO=m endif +ifeq ($(call is-board-platform,bengal),true) +AUDIO_SELECT := CONFIG_SND_SOC_BENGAL=m +endif + AUDIO_CHIPSET := audio # Build/Package only in case of supported target ifeq ($(call is-board-platform-in-list,$(MSMSTEPPE) $(TRINKET) kona lito bengal),true) @@ -52,6 +56,7 @@ LOCAL_MODULE_DEBUG_ENABLE := true LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) include $(DLKM_DIR)/AndroidKernelModule.mk ########################################################### +ifeq ($(call is-board-platform-in-list,$(MSMSTEPPE) $(TRINKET) kona lito),true) include $(CLEAR_VARS) LOCAL_MODULE := $(AUDIO_CHIPSET)_wsa_macro.ko LOCAL_MODULE_KBUILD_NAME := wsa_macro_dlkm.ko @@ -59,6 +64,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE_DEBUG_ENABLE := true LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) include $(DLKM_DIR)/AndroidKernelModule.mk +endif ########################################################### include $(CLEAR_VARS) LOCAL_MODULE := $(AUDIO_CHIPSET)_va_macro.ko diff --git a/asoc/codecs/bolero/Kbuild b/asoc/codecs/bolero/Kbuild index e6517f8a6bd9..15e5dc576da3 100644 --- a/asoc/codecs/bolero/Kbuild +++ b/asoc/codecs/bolero/Kbuild @@ -36,9 +36,9 @@ ifeq ($(KERNEL_BUILD), 0) INCS += -include $(AUDIO_ROOT)/config/litoautoconf.h endif ifeq ($(CONFIG_ARCH_BENGAL), y) - include $(AUDIO_ROOT)/config/litoauto.conf + include $(AUDIO_ROOT)/config/bengalauto.conf export - INCS += -include $(AUDIO_ROOT)/config/litoautoconf.h + INCS += -include $(AUDIO_ROOT)/config/bengalautoconf.h endif ifeq ($(CONFIG_ARCH_QCS405), y) include $(AUDIO_ROOT)/config/qcs405auto.conf diff --git a/asoc/codecs/wcd937x/Android.mk b/asoc/codecs/wcd937x/Android.mk index cbd087733d06..4168dd1b1eef 100644 --- a/asoc/codecs/wcd937x/Android.mk +++ b/asoc/codecs/wcd937x/Android.mk @@ -7,9 +7,13 @@ ifeq ($(call is-board-platform,$(MSMSTEPPE) $(TRINKET)),true) AUDIO_SELECT := CONFIG_SND_SOC_SM6150=m endif +ifeq ($(call is-board-platform,bengal),true) +AUDIO_SELECT := CONFIG_SND_SOC_BENGAL=m +endif + AUDIO_CHIPSET := audio # Build/Package only in case of supported target -ifeq ($(call is-board-platform-in-list,$(MSMSTEPPE) $(TRINKET)),true) +ifeq ($(call is-board-platform-in-list,$(MSMSTEPPE) $(TRINKET) bengal),true) LOCAL_PATH := $(call my-dir) diff --git a/asoc/codecs/wcd937x/Kbuild b/asoc/codecs/wcd937x/Kbuild index b8db20277d70..e353e8a37d67 100644 --- a/asoc/codecs/wcd937x/Kbuild +++ b/asoc/codecs/wcd937x/Kbuild @@ -26,6 +26,11 @@ ifeq ($(KERNEL_BUILD), 0) export INCS += -include $(AUDIO_ROOT)/config/sm6150autoconf.h endif + ifeq ($(CONFIG_ARCH_BENGAL), y) + include $(AUDIO_ROOT)/config/bengalauto.conf + export + INCS += -include $(AUDIO_ROOT)/config/bengalautoconf.h + endif endif # As per target team, build is done as follows: diff --git a/asoc/codecs/wcd938x/Android.mk b/asoc/codecs/wcd938x/Android.mk index 49aa2d43f5b3..96fb6f569701 100644 --- a/asoc/codecs/wcd938x/Android.mk +++ b/asoc/codecs/wcd938x/Android.mk @@ -13,7 +13,7 @@ endif AUDIO_CHIPSET := audio # Build/Package only in case of supported target -ifeq ($(call is-board-platform-in-list,kona lito bengal),true) +ifeq ($(call is-board-platform-in-list,kona lito),true) LOCAL_PATH := $(call my-dir) diff --git a/asoc/codecs/wcd938x/Kbuild b/asoc/codecs/wcd938x/Kbuild index 99d71953dff2..3dfe142bcfc2 100644 --- a/asoc/codecs/wcd938x/Kbuild +++ b/asoc/codecs/wcd938x/Kbuild @@ -23,11 +23,6 @@ ifeq ($(KERNEL_BUILD), 0) export INCS += -include $(AUDIO_ROOT)/config/litoautoconf.h endif - ifeq ($(CONFIG_ARCH_BENGAL), y) - include $(AUDIO_ROOT)/config/litoauto.conf - export - INCS += -include $(AUDIO_ROOT)/config/litoautoconf.h - endif endif diff --git a/config/bengalauto.conf b/config/bengalauto.conf new file mode 100644 index 000000000000..d6fdadd7a5f3 --- /dev/null +++ b/config/bengalauto.conf @@ -0,0 +1,34 @@ +CONFIG_PINCTRL_LPI=m +CONFIG_AUDIO_EXT_CLK=m +CONFIG_SND_SOC_WCD9XXX_V2=m +CONFIG_SND_SOC_WCD_MBHC=m +CONFIG_SND_SOC_WSA881X_ANALOG=m +CONFIG_WCD9XXX_CODEC_CORE_V2=m +CONFIG_MSM_CDC_PINCTRL=m +CONFIG_MSM_QDSP6V2_CODECS=m +CONFIG_MSM_ULTRASOUND=m +CONFIG_MSM_QDSP6_APRV2_RPMSG=m +CONFIG_MSM_ADSP_LOADER=m +CONFIG_REGMAP_SWR=m +CONFIG_MSM_QDSP6_SSR=m +CONFIG_MSM_QDSP6_PDR=m +CONFIG_MSM_QDSP6_NOTIFIER=m +CONFIG_SND_SOC_MSM_HOSTLESS_PCM=m +CONFIG_SND_SOC_MSM_QDSP6V2_INTF=m +CONFIG_SOUNDWIRE=m +CONFIG_SOUNDWIRE_MSTR_CTRL=m +CONFIG_SND_SOC_QDSP6V2=m +CONFIG_SND_SOC_WCD_MBHC_ADC=m +CONFIG_QTI_PP=m +CONFIG_SND_HWDEP_ROUTING=m +CONFIG_SND_SOC_MSM_STUB=m +CONFIG_MSM_AVTIMER=m +CONFIG_SND_SOC_BOLERO=m +CONFIG_VA_MACRO=m +CONFIG_RX_MACRO=m +CONFIG_TX_MACRO=m +CONFIG_SND_SOC_WCD_IRQ=m +CONFIG_SND_SOC_WCD937X=m +CONFIG_SND_SOC_WCD937X_SLAVE=m +CONFIG_SND_SOC_BENGAL=m +CONFIG_SND_EVENT=m diff --git a/config/bengalautoconf.h b/config/bengalautoconf.h new file mode 100644 index 000000000000..90d3e3c52448 --- /dev/null +++ b/config/bengalautoconf.h @@ -0,0 +1,38 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (c) 2019, The Linux Foundation. All rights reserved. + */ + +#define CONFIG_PINCTRL_LPI 1 +#define CONFIG_AUDIO_EXT_CLK 1 +#define CONFIG_SND_SOC_WCD9XXX_V2 1 +#define CONFIG_SND_SOC_WCD_MBHC 1 +#define CONFIG_SND_SOC_WSA881X_ANALOG 1 +#define CONFIG_WCD9XXX_CODEC_CORE_V2 1 +#define CONFIG_MSM_CDC_PINCTRL 1 +#define CONFIG_MSM_QDSP6V2_CODECS 1 +#define CONFIG_MSM_ULTRASOUND 1 +#define CONFIG_MSM_QDSP6_APRV2_RPMSG 1 +#define CONFIG_SND_SOC_MSM_QDSP6V2_INTF 1 +#define CONFIG_MSM_ADSP_LOADER 1 +#define CONFIG_REGMAP_SWR 1 +#define CONFIG_MSM_QDSP6_SSR 1 +#define CONFIG_MSM_QDSP6_PDR 1 +#define CONFIG_MSM_QDSP6_NOTIFIER 1 +#define CONFIG_SND_SOC_MSM_HOSTLESS_PCM 1 +#define CONFIG_SOUNDWIRE 1 +#define CONFIG_SOUNDWIRE_MSTR_CTRL 1 +#define CONFIG_SND_SOC_WCD_MBHC_ADC 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_MSM_AVTIMER 1 +#define CONFIG_SND_SOC_BOLERO 1 +#define CONFIG_VA_MACRO 1 +#define CONFIG_RX_MACRO 1 +#define CONFIG_TX_MACRO 1 +#define CONFIG_SND_SOC_WCD_IRQ 1 +#define CONFIG_SND_SOC_WCD937X 1 +#define CONFIG_SND_SOC_WCD937X_SLAVE 1 +#define CONFIG_SND_SOC_BENGAL 1 +#define CONFIG_SND_EVENT 1 diff --git a/dsp/Android.mk b/dsp/Android.mk index df13d3d5d968..c5ab3ff51ab6 100644 --- a/dsp/Android.mk +++ b/dsp/Android.mk @@ -27,6 +27,10 @@ ifeq ($(call is-board-platform, lito),true) AUDIO_SELECT := CONFIG_SND_SOC_LITO=m endif +ifeq ($(call is-board-platform, bengal),true) +AUDIO_SELECT := CONFIG_SND_SOC_BENGAL=m +endif + AUDIO_CHIPSET := audio # Build/Package only in case of supported target ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE) $(TRINKET) kona lito bengal sdmshrike),true) diff --git a/dsp/Kbuild b/dsp/Kbuild index 81f80940399b..006de44589f2 100644 --- a/dsp/Kbuild +++ b/dsp/Kbuild @@ -40,9 +40,9 @@ ifeq ($(KERNEL_BUILD), 0) INCS += -include $(AUDIO_ROOT)/config/litoautoconf.h endif ifeq ($(CONFIG_ARCH_BENGAL), y) - include $(AUDIO_ROOT)/config/litoauto.conf + include $(AUDIO_ROOT)/config/bengalauto.conf export - INCS += -include $(AUDIO_ROOT)/config/litoautoconf.h + INCS += -include $(AUDIO_ROOT)/config/bengalautoconf.h endif ifeq ($(CONFIG_ARCH_SM8150), y) ifdef CONFIG_SND_SOC_SA8155 diff --git a/dsp/codecs/Android.mk b/dsp/codecs/Android.mk index 3d122f614600..59a1603cb19e 100644 --- a/dsp/codecs/Android.mk +++ b/dsp/codecs/Android.mk @@ -19,6 +19,10 @@ ifeq ($(call is-board-platform,lito),true) AUDIO_SELECT := CONFIG_SND_SOC_LITO=m endif +ifeq ($(call is-board-platform,bengal),true) +AUDIO_SELECT := CONFIG_SND_SOC_BENGAL=m +endif + AUDIO_CHIPSET := audio # Build/Package only in case of supported target ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE) $(TRINKET) kona lito bengal sdmshrike),true) diff --git a/dsp/codecs/Kbuild b/dsp/codecs/Kbuild index 3bdcd7d2a988..8709901de96b 100644 --- a/dsp/codecs/Kbuild +++ b/dsp/codecs/Kbuild @@ -34,9 +34,9 @@ ifeq ($(KERNEL_BUILD), 0) INCS += -include $(AUDIO_ROOT)/config/litoautoconf.h endif ifeq ($(CONFIG_ARCH_BENGAL), y) - include $(AUDIO_ROOT)/config/litoauto.conf + include $(AUDIO_ROOT)/config/bengalauto.conf export - INCS += -include $(AUDIO_ROOT)/config/litoautoconf.h + INCS += -include $(AUDIO_ROOT)/config/bengalautoconf.h endif ifeq ($(CONFIG_ARCH_SM8150), y) include $(AUDIO_ROOT)/config/sm8150auto.conf diff --git a/ipc/Android.mk b/ipc/Android.mk index 62d78d06e61b..3238a791e15e 100644 --- a/ipc/Android.mk +++ b/ipc/Android.mk @@ -27,6 +27,10 @@ ifeq ($(call is-board-platform,lito),true) AUDIO_SELECT := CONFIG_SND_SOC_LITO=m endif +ifeq ($(call is-board-platform,bengal),true) +AUDIO_SELECT := CONFIG_SND_SOC_BENGAL=m +endif + AUDIO_CHIPSET := audio # Build/Package only in case of supported target ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE) $(TRINKET) kona lito bengal sdmshrike),true) diff --git a/ipc/Kbuild b/ipc/Kbuild index bb63b6f18689..bbea67396ed4 100644 --- a/ipc/Kbuild +++ b/ipc/Kbuild @@ -41,9 +41,9 @@ ifeq ($(KERNEL_BUILD), 0) INCS += -include $(AUDIO_ROOT)/config/litoautoconf.h endif ifeq ($(CONFIG_ARCH_BENGAL), y) - include $(AUDIO_ROOT)/config/litoauto.conf + include $(AUDIO_ROOT)/config/bengalauto.conf export - INCS += -include $(AUDIO_ROOT)/config/litoautoconf.h + INCS += -include $(AUDIO_ROOT)/config/bengalautoconf.h endif ifeq ($(CONFIG_ARCH_SM8150), y) ifdef CONFIG_SND_SOC_SA8155 diff --git a/soc/Android.mk b/soc/Android.mk index 21d3d0a0ac6b..9ed83d4d468e 100644 --- a/soc/Android.mk +++ b/soc/Android.mk @@ -27,6 +27,10 @@ ifeq ($(call is-board-platform,lito),true) AUDIO_SELECT := CONFIG_SND_SOC_LITO=m endif +ifeq ($(call is-board-platform,bengal),true) +AUDIO_SELECT := CONFIG_SND_SOC_BENGAL=m +endif + AUDIO_CHIPSET := audio # Build/Package only in case of supported target ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE) $(TRINKET) kona lito bengal sdmshrike),true) @@ -56,7 +60,7 @@ KBUILD_OPTIONS += BOARD_PLATFORM=$(TARGET_BOARD_PLATFORM) KBUILD_OPTIONS += $(AUDIO_SELECT) ########################################################### -ifeq ($(call is-board-platform-in-list,$(MSMSTEPPE) $(TRINKET) kona lito),true) +ifeq ($(call is-board-platform-in-list,$(MSMSTEPPE) $(TRINKET) kona lito bengal),true) ifneq ($(TARGET_BOARD_AUTO),true) include $(CLEAR_VARS) LOCAL_MODULE := $(AUDIO_CHIPSET)_pinctrl_lpi.ko @@ -98,7 +102,7 @@ LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) include $(DLKM_DIR)/AndroidKernelModule.mk endif ########################################################### -ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE) kona lito sdmshrike),true) +ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE) kona lito bengal sdmshrike),true) ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile)) include $(CLEAR_VARS) LOCAL_MODULE := $(AUDIO_CHIPSET)_snd_event.ko diff --git a/soc/Kbuild b/soc/Kbuild index 83bb243a5f81..9e32c429fa2b 100644 --- a/soc/Kbuild +++ b/soc/Kbuild @@ -35,9 +35,9 @@ ifeq ($(KERNEL_BUILD), 0) INCS += -include $(AUDIO_ROOT)/config/litoautoconf.h endif ifeq ($(CONFIG_ARCH_BENGAL), y) - include $(AUDIO_ROOT)/config/litoauto.conf + include $(AUDIO_ROOT)/config/bengalauto.conf export - INCS += -include $(AUDIO_ROOT)/config/litoautoconf.h + INCS += -include $(AUDIO_ROOT)/config/bengalautoconf.h endif ifeq ($(CONFIG_ARCH_SM6150), y) ifdef CONFIG_SND_SOC_SA6155