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

Commit dd226cab authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: config: add config to compile audio drivers for kona"

parents f6d54eff b0e04799

Android.mk

+5 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ MY_LOCAL_PATH := $(call my-dir) 


UAPI_OUT := $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/include



ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE) $(TRINKET)),true)

ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE) $(TRINKET) kona),true)

$(shell mkdir -p $(UAPI_OUT)/linux;)

$(shell mkdir -p $(UAPI_OUT)/sound;)

$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/ipc/Module.symvers)
@@ -12,7 +12,6 @@ $(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/dsp/codecs 
$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/soc/Module.symvers)

$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/Module.symvers)

$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/Module.symvers)

$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/wcd934x/Module.symvers)



include $(MY_LOCAL_PATH)/include/uapi/Android.mk

include $(MY_LOCAL_PATH)/ipc/Android.mk
@@ -21,6 +20,10 @@ include $(MY_LOCAL_PATH)/dsp/codecs/Android.mk 
include $(MY_LOCAL_PATH)/soc/Android.mk

include $(MY_LOCAL_PATH)/asoc/Android.mk

include $(MY_LOCAL_PATH)/asoc/codecs/Android.mk

endif



ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE) $(TRINKET)),true)

$(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

endif

asoc/Android.mk

+6 −1
Original line number Diff line number Diff line
@@ -18,9 +18,14 @@ TARGET := trinket 
AUDIO_SELECT  := CONFIG_SND_SOC_SM6150=m

endif



ifeq ($(call is-board-platform,kona),true)

TARGET := kona

AUDIO_SELECT  := CONFIG_SND_SOC_KONA=m

endif



AUDIO_CHIPSET := audio

# Build/Package only in case of supported target

ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE) $(TRINKET)),true)

ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE) $(TRINKET) kona),true)



LOCAL_PATH := $(call my-dir)

asoc/Kbuild

+8 −1
Original line number Diff line number Diff line
@@ -29,6 +29,11 @@ ifeq ($(KERNEL_BUILD), 0) 
		export

		INCS    +=  -include $(AUDIO_ROOT)/config/sm6150autoconf.h

	endif

	ifeq ($(CONFIG_ARCH_KONA), y)

		include $(AUDIO_ROOT)/config/konaauto.conf

		export

		INCS    +=  -include $(AUDIO_ROOT)/config/konaautoconf.h

	endif

	ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)

		include $(AUDIO_ROOT)/config/sm8150auto.conf

		export
@@ -99,7 +104,6 @@ ifdef CONFIG_SND_SOC_QDSP6V2 
	PLATFORM_OBJS += msm-dai-fe.o

	PLATFORM_OBJS += msm-dai-q6-hdmi-v2.o

	PLATFORM_OBJS += msm-dai-q6-v2.o

	PLATFORM_OBJS += msm-dai-slim.o

	PLATFORM_OBJS += msm-dai-stub-v2.o

	PLATFORM_OBJS += msm-lsm-client.o

	PLATFORM_OBJS += msm-pcm-afe-v2.o
@@ -115,6 +119,9 @@ ifdef CONFIG_SND_SOC_QDSP6V2 
	PLATFORM_OBJS += msm-transcode-loopback-q6-v2.o

	PLATFORM_OBJS += platform_init.o

endif

ifdef CONFIG_WCD9XXX_CODEC_CORE

	PLATFORM_OBJS += msm-dai-slim.o

endif

ifdef CONFIG_DOLBY_DS2

	PLATFORM_OBJS += msm-ds2-dap-config.o

endif

asoc/codecs/Android.mk

+7 −1
Original line number Diff line number Diff line
@@ -15,9 +15,13 @@ ifeq ($(call is-board-platform,$(TRINKET)),true) 
AUDIO_SELECT  := CONFIG_SND_SOC_SM6150=m

endif



ifeq ($(call is-board-platform,kona),true)

AUDIO_SELECT  := CONFIG_SND_SOC_KONA=m

endif



AUDIO_CHIPSET := audio

# Build/Package only in case of supported target

ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE) $(TRINKET)),true)

ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE) $(TRINKET) kona),true)



LOCAL_PATH := $(call my-dir)
@@ -70,6 +74,7 @@ LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) 
include $(DLKM_DIR)/AndroidKernelModule.mk

endif

###########################################################

ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE) $(TRINKET)),true)

include $(CLEAR_VARS)

LOCAL_MODULE              := $(AUDIO_CHIPSET)_wcd_spi.ko

LOCAL_MODULE_KBUILD_NAME  := wcd_spi_dlkm.ko
@@ -77,6 +82,7 @@ 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, ),true)

include $(CLEAR_VARS)

asoc/codecs/Kbuild

+15 −1
Original line number Diff line number Diff line
@@ -29,6 +29,11 @@ ifeq ($(KERNEL_BUILD), 0) 
		export

		INCS    +=  -include $(AUDIO_ROOT)/config/sm6150autoconf.h

	endif

	ifeq ($(CONFIG_ARCH_KONA), y)

		include $(AUDIO_ROOT)/config/konaauto.conf

		export

		INCS    +=  -include $(AUDIO_ROOT)/config/konaautoconf.h

	endif

	ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)

		include $(AUDIO_ROOT)/config/sm8150auto.conf

		export
@@ -81,10 +86,18 @@ ifdef CONFIG_WCD9XXX_CODEC_CORE 
	CORE_OBJS += wcd934x/wcd934x-tables.o

endif



ifdef CONFIG_WCD9XXX_CODEC_CORE_V2

	CORE_OBJS += msm-cdc-pinctrl.o

	CORE_OBJS += msm-cdc-supply.o

endif



ifdef CONFIG_SND_SOC_WCD9XXX_V2

	WCD9XXX_OBJS += wcd-clsh.o

ifdef CONFIG_WCD9XXX_CODEC_CORE

	WCD9XXX_OBJS += wcd9xxx-common-v2.o

	WCD9XXX_OBJS += wcd9xxx-resmgr-v2.o

else

	WCD9XXX_OBJS += wcd-clsh.o

endif

	WCD9XXX_OBJS += wcdcal-hwdep.o

	WCD9XXX_OBJS += wcd9xxx-soc-init.o

	WCD9XXX_OBJS += wcd-dsp-utils.o
@@ -181,6 +194,7 @@ ifeq ($(KERNEL_BUILD), 1) 
endif

# Module information used by KBuild framework

obj-$(CONFIG_WCD9XXX_CODEC_CORE) += wcd_core_dlkm.o

obj-$(CONFIG_WCD9XXX_CODEC_CORE_V2) += wcd_core_dlkm.o

wcd_core_dlkm-y := $(CORE_OBJS)



obj-$(CONFIG_SND_SOC_WCD9XXX_V2) += wcd9xxx_dlkm.o