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

Commit d11d6f06 authored by Soumya Managoli's avatar Soumya Managoli Committed by Gerrit - the friendly Code Review server
Browse files

ASoC: sdm660 audio changes 



Enable compilation for sdm660 target.
Bring in sdm660_cdc codec driver.
Bring in sdm660 machine driver.
Update codec driver to component driver to align
with kernel-4.19 ALSA.

Change-Id: I927a032d077bcce6b3dcc4a95445e8b1e86d461a
Signed-off-by: default avatarSoumya Managoli <smanag@codeaurora.org>
parent 8d4f94c5

Android.mk

+12 −0
Original line number Diff line number Diff line
@@ -31,6 +31,11 @@ include $(MY_LOCAL_PATH)/soc/Android.mk 
endif

endif



ifeq ($(call is-board-platform-in-list,sdm660),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



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

ifneq ($(TARGET_BOARD_AUTO),true)

$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/aqt1000/Module.symvers)
@@ -65,3 +70,10 @@ ifeq ($(call is-board-platform-in-list, lito),true) 
$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/wsa883x/Module.symvers)

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

endif



ifeq ($(call is-board-platform-in-list, sdm660),true)

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

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

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

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

endif

Makefile

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ ifeq ($(CONFIG_ARCH_SDM660), y) 
LINUXINCLUDE    += \

                -include $(srctree)/techpack/audio/config/sdm660autoconf.h

endif



obj-y += soc/

obj-y += dsp/

obj-y += ipc/

Makefile.am

+5 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ obj-m += dsp/codecs/ 
obj-m += soc/

obj-m += asoc/

obj-m += asoc/codecs/

ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), sdmsteppe))

ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), sdmsteppe, sdm660))

obj-m += asoc/codecs/wcd934x/

endif

ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), qcs40x))
@@ -45,6 +45,10 @@ obj-m += asoc/codecs/bolero/ 
obj-m += asoc/codecs/wcd938x/

endif



ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), sdm660))

obj-m += asoc/codecs/sdm660_cdc/

endif



ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), sa8155 sa8155ivi sa6155 sa8195 qtiquingvm))

obj-m := ipc/

obj-m += dsp/

asoc/Android.mk

+6 −1
Original line number Diff line number Diff line
@@ -41,9 +41,14 @@ TARGET := bengal 
AUDIO_SELECT  := CONFIG_SND_SOC_BENGAL=m

endif



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

TARGET := sdm660

AUDIO_SELECT  := CONFIG_SND_SOC_SDM660=m

endif



AUDIO_CHIPSET := audio

# Build/Package only in case of supported target

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

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



LOCAL_PATH := $(call my-dir)

asoc/Kbuild

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

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

	endif

	ifeq ($(CONFIG_ARCH_SDM660), y)

		include $(AUDIO_ROOT)/config/sdm660auto.conf

		export

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

	endif

endif



# As per target team, build is done as follows:
@@ -145,6 +150,22 @@ ifdef CONFIG_SND_SOC_SA8155 
	MACHINE_OBJS += sa8155.o

endif



# for SDM6xx sound card driver

ifdef CONFIG_SND_SOC_SDM660

        MACHINE_OBJS += sdm660-common.o

endif



# for SDM6xx sound card driver

ifdef CONFIG_SND_SOC_INT_CODEC

        MACHINE_OBJS += sdm660-internal.o

endif



# for SDM6xx sound card driver

ifdef CONFIG_SND_SOC_EXT_CODEC

        MACHINE_OBJS += sdm660-external.o

        MACHINE_OBJS += sdm660-ext-dai-links.o

endif



ifdef CONFIG_SND_SOC_CPE

	CPE_LSM_OBJS += msm-cpe-lsm.o

endif
@@ -223,6 +244,8 @@ KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/dsp/Module 
KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/Module.symvers

KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/wcd934x/Module.symvers

KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/wcd937x/Module.symvers

KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/sdm660_cdc/Module.symvers

KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/msm_sdw/Module.symvers

endif

ifeq ($(KERNEL_BUILD), 1)

	obj-y += codecs/
@@ -255,6 +278,12 @@ machine_dlkm-y := $(MACHINE_OBJS) 
obj-$(CONFIG_SND_SOC_SA8155) += machine_dlkm.o

machine_dlkm-y := $(MACHINE_OBJS)



obj-$(CONFIG_SND_SOC_EXT_CODEC) += machine_dlkm.o

machine_dlkm-y := $(MACHINE_OBJS)



obj-$(CONFIG_SND_SOC_INT_CODEC) += machine_dlkm.o

machine_dlkm-y := $(MACHINE_OBJS)



obj-$(CONFIG_SND_SOC_CPE) += cpe_lsm_dlkm.o

cpe_lsm_dlkm-y := $(CPE_LSM_OBJS)