diff options
| author | Derek Chen <chenche@codeaurora.org> | 2019-03-14 10:26:41 -0700 |
|---|---|---|
| committer | Derek Chen <chenche@codeaurora.org> | 2019-07-19 14:36:00 -0700 |
| commit | c8940293bfc99c77f302af2fedc866e93fa15785 (patch) | |
| tree | 149d159d4a831c1dadb808f921ca075c1e9c55df /soc | |
| parent | f53de7f9fb98f4236ab7aed20960a74702cb966e (diff) | |
| download | msm-extra-c8940293bfc99c77f302af2fedc866e93fa15785.tar.gz | |
ASoC: msm: use snd event fwk for ssr on auto platform
Switch to use SND event FWK for SSR handling
instead of audio notifier on automotive platform.
Change-Id: I8d0b1ac8f09417a8b33a8e8141f7ae06e1195f54
Signed-off-by: Derek Chen <chenche@codeaurora.org>
Diffstat (limited to 'soc')
| -rw-r--r-- | soc/Android.mk | 10 | ||||
| -rw-r--r-- | soc/Kbuild | 17 |
2 files changed, 23 insertions, 4 deletions
diff --git a/soc/Android.mk b/soc/Android.mk index 8698a56a..969c38f6 100644 --- a/soc/Android.mk +++ b/soc/Android.mk @@ -4,8 +4,12 @@ # Check if this driver needs be built for current target ifeq ($(call is-board-platform,msmnile),true) +ifeq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au msmnile_gvmq)) +AUDIO_SELECT := CONFIG_SND_SOC_SA8155=m +else AUDIO_SELECT := CONFIG_SND_SOC_SM8150=m endif +endif ifeq ($(call is-board-platform-in-list,$(MSMSTEPPE) $(TRINKET)),true) AUDIO_SELECT := CONFIG_SND_SOC_SM6150=m @@ -68,6 +72,7 @@ LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) include $(DLKM_DIR)/AndroidKernelModule.mk endif ########################################################### +ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au msmnile_gvmq)) include $(CLEAR_VARS) LOCAL_MODULE := $(AUDIO_CHIPSET)_swr.ko LOCAL_MODULE_KBUILD_NAME := swr_dlkm.ko @@ -83,8 +88,10 @@ 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, $(MSMSTEPPE) kona lito),true) +ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE) kona lito),true) +ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile)) include $(CLEAR_VARS) LOCAL_MODULE := $(AUDIO_CHIPSET)_snd_event.ko LOCAL_MODULE_KBUILD_NAME := snd_event_dlkm.ko @@ -93,6 +100,7 @@ LOCAL_MODULE_DEBUG_ENABLE := true LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) include $(DLKM_DIR)/AndroidKernelModule.mk endif +endif ########################################################### endif # DLKM check @@ -15,9 +15,15 @@ endif ifeq ($(KERNEL_BUILD), 0) ifeq ($(CONFIG_ARCH_SM8150), y) - include $(AUDIO_ROOT)/config/sm8150auto.conf - export - INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h + 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 @@ -48,6 +54,11 @@ ifeq ($(KERNEL_BUILD), 0) export INCS += -include $(AUDIO_ROOT)/config/qcs405autoconf.h endif + ifeq ($(CONFIG_QTI_GVM), y) + include $(AUDIO_ROOT)/config/gvmauto.conf + export + INCS += -include $(AUDIO_ROOT)/config/gvmautoconf.h + endif endif # As per target team, build is done as follows: |