mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-12 07:37:31 -04:00
Merge "ASoC: msm: Add audio support for sdmshrike on auto platform"
This commit is contained in:
commit
3f29588ad6
9 changed files with 45 additions and 21 deletions
|
|
@ -23,7 +23,7 @@ include $(MY_LOCAL_PATH)/asoc/codecs/Android.mk
|
|||
endif
|
||||
|
||||
ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE) $(TRINKET)),true)
|
||||
ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au sm6150_au msmnile_gvmq))
|
||||
ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au sm6150_au msmnile_gvmq sdmshrike_au))
|
||||
$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/wcd934x/Module.symvers)
|
||||
include $(MY_LOCAL_PATH)/asoc/codecs/wcd934x/Android.mk
|
||||
$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/soc/Module.symvers)
|
||||
|
|
@ -32,7 +32,7 @@ endif
|
|||
endif
|
||||
|
||||
ifeq ($(call is-board-platform-in-list,msmnile),true)
|
||||
ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au msmnile_gvmq))
|
||||
ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au msmnile_gvmq sdmshrike_au))
|
||||
$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/aqt1000/Module.symvers)
|
||||
include $(MY_LOCAL_PATH)/asoc/codecs/aqt1000/Android.mk
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
# Check if this driver needs be built for current target
|
||||
ifeq ($(call is-board-platform,msmnile),true)
|
||||
TARGET := msmnile
|
||||
ifeq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au msmnile_gvmq))
|
||||
ifeq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au msmnile_gvmq sdmshrike_au))
|
||||
AUDIO_SELECT := CONFIG_SND_SOC_SA8155=m
|
||||
else
|
||||
AUDIO_SELECT := CONFIG_SND_SOC_SM8150=m
|
||||
|
|
|
|||
12
asoc/Kbuild
12
asoc/Kbuild
|
|
@ -51,9 +51,15 @@ ifeq ($(KERNEL_BUILD), 0)
|
|||
INCS += -include $(AUDIO_ROOT)/config/litoautoconf.h
|
||||
endif
|
||||
ifeq ($(CONFIG_ARCH_SDMSHRIKE), 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_QCS405), y)
|
||||
include $(AUDIO_ROOT)/config/qcs405auto.conf
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
# 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))
|
||||
ifeq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au msmnile_gvmq sdmshrike_au))
|
||||
AUDIO_SELECT := CONFIG_SND_SOC_SA8155=m
|
||||
else
|
||||
AUDIO_SELECT := CONFIG_SND_SOC_SM8150=m
|
||||
|
|
@ -81,7 +81,7 @@ LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
|
|||
include $(DLKM_DIR)/AndroidKernelModule.mk
|
||||
###########################################################
|
||||
# target specific build
|
||||
ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au sm6150_au msmnile_gvmq))
|
||||
ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au sm6150_au msmnile_gvmq sdmshrike_au))
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_MODULE := $(AUDIO_CHIPSET)_usf.ko
|
||||
LOCAL_MODULE_KBUILD_NAME := usf_dlkm.ko
|
||||
|
|
|
|||
12
dsp/Kbuild
12
dsp/Kbuild
|
|
@ -51,9 +51,15 @@ ifeq ($(KERNEL_BUILD), 0)
|
|||
endif
|
||||
endif
|
||||
ifeq ($(CONFIG_ARCH_SDMSHRIKE), 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_QCS405), y)
|
||||
include $(AUDIO_ROOT)/config/qcs405auto.conf
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
# 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))
|
||||
ifeq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au msmnile_gvmq sdmshrike_au))
|
||||
AUDIO_SELECT := CONFIG_SND_SOC_SA8155=m
|
||||
else
|
||||
AUDIO_SELECT := CONFIG_SND_SOC_SM8150=m
|
||||
|
|
@ -65,7 +65,7 @@ LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
|
|||
include $(DLKM_DIR)/AndroidKernelModule.mk
|
||||
###########################################################
|
||||
ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE) $(TRINKET)),true)
|
||||
ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au sm6150_au msmnile_gvmq))
|
||||
ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au sm6150_au msmnile_gvmq sdmshrike_au))
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_MODULE := $(AUDIO_CHIPSET)_wglink.ko
|
||||
LOCAL_MODULE_KBUILD_NAME := wglink_dlkm.ko
|
||||
|
|
|
|||
12
ipc/Kbuild
12
ipc/Kbuild
|
|
@ -57,9 +57,15 @@ ifeq ($(KERNEL_BUILD), 0)
|
|||
INCS += -include $(AUDIO_ROOT)/config/qcs405autoconf.h
|
||||
endif
|
||||
ifeq ($(CONFIG_ARCH_SDMSHRIKE), 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_QTI_GVM), y)
|
||||
include $(AUDIO_ROOT)/config/gvmauto.conf
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
# 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))
|
||||
ifeq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au msmnile_gvmq sdmshrike_au))
|
||||
AUDIO_SELECT := CONFIG_SND_SOC_SA8155=m
|
||||
else
|
||||
AUDIO_SELECT := CONFIG_SND_SOC_SM8150=m
|
||||
|
|
@ -80,7 +80,7 @@ include $(DLKM_DIR)/AndroidKernelModule.mk
|
|||
endif
|
||||
endif
|
||||
###########################################################
|
||||
ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au msmnile_gvmq sm6150_au))
|
||||
ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au msmnile_gvmq sm6150_au sdmshrike_au))
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_MODULE := $(AUDIO_CHIPSET)_swr.ko
|
||||
LOCAL_MODULE_KBUILD_NAME := swr_dlkm.ko
|
||||
|
|
|
|||
12
soc/Kbuild
12
soc/Kbuild
|
|
@ -51,9 +51,15 @@ ifeq ($(KERNEL_BUILD), 0)
|
|||
INCS += -include $(AUDIO_ROOT)/config/sm6150autoconf.h
|
||||
endif
|
||||
ifeq ($(CONFIG_ARCH_SDMSHRIKE), 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_QCS405), y)
|
||||
include $(AUDIO_ROOT)/config/qcs405auto.conf
|
||||
|
|
|
|||
Loading…
Reference in a new issue