Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f29588a authored Aug 02, 2019 by qctecmdr Committed by Gerrit - the friendly Code Review server Aug 02, 2019

Merge "ASoC: msm: Add audio support for sdmshrike on auto platform"

parents 76880681 583e3bf1

Android.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -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

asoc/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

asoc/Kbuild

+9 −3

Original line number	Diff line number	Diff line
		@@ -51,10 +51,16 @@ ifeq ($(KERNEL_BUILD), 0)
		INCS += -include $(AUDIO_ROOT)/config/litoautoconf.h
		endif
		ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
		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
		export

dsp/Android.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -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

dsp/Kbuild

+9 −3

Original line number	Diff line number	Diff line
		@@ -51,10 +51,16 @@ ifeq ($(KERNEL_BUILD), 0)
		endif
		endif
		ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
		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
		export