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

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

Merge "ASoC: codec: add configure of internal codec for MSM8909"

parents 3745fe66 0e16b0c2

Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ obj-m += asoc/codecs/ 
ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), sdm670 qcs605))

obj-m += asoc/codecs/wcd934x/

endif

ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), apq8053 sdm670 qcs605))

ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), apq8053 sdm670 qcs605 apq8009))

obj-m += asoc/codecs/sdm660_cdc/

endif

ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), sdm670 qcs605))

asoc/Kbuild

+7 −0
Original line number Diff line number Diff line
@@ -115,6 +115,10 @@ ifdef CONFIG_SND_SOC_SDM450 
	MACHINE_OBJS += msm8952.o

endif



ifdef CONFIG_SND_SOC_MSM8909

	MACHINE_INT_OBJS += msm8952.o

endif



# for SDM450 external codec sound card driver

ifdef CONFIG_SND_SOC_EXT_CODEC_SDM450

	MACHINE_EXT_OBJS += msm8952-slimbus.o
@@ -214,6 +218,9 @@ platform_dlkm-y := $(PLATFORM_OBJS) 
obj-$(CONFIG_SND_SOC_SDM450) += machine_dlkm.o

machine_dlkm-y := $(MACHINE_OBJS)



obj-$(CONFIG_SND_SOC_MSM8909) += machine_int_dlkm.o

machine_int_dlkm-y := $(MACHINE_INT_OBJS)



obj-$(CONFIG_SND_SOC_EXT_CODEC_8909) += machine_ext_dlkm.o

machine_ext_dlkm-y := $(MACHINE_EXT_OBJS)

asoc/codecs/sdm660_cdc/Kbuild

+5 −0
Original line number Diff line number Diff line
@@ -40,6 +40,11 @@ ifeq ($(KERNEL_BUILD), 0) 
		export

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

	endif

	ifeq ($(CONFIG_ARCH_MSM8909), y)

		include $(AUDIO_ROOT)/config/msm8909auto.conf

		export

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

	endif

endif



# As per target team, build is done as follows:

config/msm8909auto.conf

+1 −0
Original line number Diff line number Diff line
@@ -35,3 +35,4 @@ CONFIG_SND_SOC_WCD9335=m 
CONFIG_SND_SOC_WSA881X=m

CONFIG_COMMON_CLK_MSM=m

CONFIG_SND_SOC_EXT_CODEC_8909=m

CONFIG_SND_SOC_WSA881X_ANALOG=m

config/msm8909autoconf.h

+1 −0
Original line number Diff line number Diff line
@@ -48,3 +48,4 @@ 
#define CONFIG_SND_SOC_WSA881X 1

#define CONFIG_COMMON_CLK_MSM 1

#define CONFIG_SND_SOC_EXT_CODEC_8909 1

#define CONFIG_SND_SOC_WSA881X_ANALOG 1