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

Commit 132b93d1 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: Audio bringup changes for msm8937_32go."

parents b94373ab 411c3d05

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) kona lito bengal sdmshrike sdm660),true)

ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE) $(TRINKET) kona lito bengal sdmshrike sdm660 msm8953 msm8937),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,6 +12,9 @@ $(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)

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

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

endif



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

include $(MY_LOCAL_PATH)/ipc/Android.mk
@@ -71,7 +74,7 @@ $(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codec 
include $(MY_LOCAL_PATH)/asoc/codecs/wsa883x/Android.mk

endif



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

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

Makefile.am

+4 −1
Original line number Diff line number Diff line
@@ -20,6 +20,9 @@ endif 
ifeq ($(TARGET_SUPPORT),sdm660)

KBUILD_OPTIONS += CONFIG_ARCH_SDM660=y

endif

ifeq ($(TARGET_SUPPORT),apq8053 msm8953 msm8937)

KBUILD_OPTIONS += CONFIG_ARCH_SDM450=y

endif



obj-m := ipc/

obj-m += dsp/
@@ -45,7 +48,7 @@ obj-m += asoc/codecs/bolero/ 
obj-m += asoc/codecs/wcd938x/

endif



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

ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), apq8053 sdm660 msm8953 msm8937))

obj-m += asoc/codecs/sdm660_cdc/

endif

asoc/Android.mk

+18 −2
Original line number Diff line number Diff line
@@ -46,9 +46,15 @@ TARGET := sdm660 
AUDIO_SELECT  := CONFIG_SND_SOC_SDM660=m

endif



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

TARGET := sdm450

AUDIO_SELECT  += CONFIG_SND_SOC_SDM450=m

AUDIO_SELECT  += CONFIG_SND_SOC_EXT_CODEC_SDM450=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 sdm660),true)

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



LOCAL_PATH := $(call my-dir)
@@ -83,7 +89,7 @@ LOCAL_MODULE_DEBUG_ENABLE := true 
LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)

include $(DLKM_DIR)/AndroidKernelModule.mk

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

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

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

include $(CLEAR_VARS)

LOCAL_MODULE              := $(AUDIO_CHIPSET)_cpe_lsm.ko

LOCAL_MODULE_KBUILD_NAME  := cpe_lsm_dlkm.ko
@@ -101,6 +107,16 @@ LOCAL_MODULE_DEBUG_ENABLE := true 
LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)

include $(DLKM_DIR)/AndroidKernelModule.mk

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

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

include $(CLEAR_VARS)

LOCAL_MODULE              := $(AUDIO_CHIPSET)_machine_ext_$(TARGET).ko

LOCAL_MODULE_KBUILD_NAME  := machine_ext_dlkm.ko

LOCAL_MODULE_TAGS         := optional

LOCAL_MODULE_DEBUG_ENABLE := true

LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)

include $(DLKM_DIR)/AndroidKernelModule.mk

endif

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



endif # DLKM check

endif # supported target check

asoc/Kbuild

+32 −0
Original line number Diff line number Diff line
@@ -81,6 +81,21 @@ ifeq ($(KERNEL_BUILD), 0) 
		export

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

	endif

	ifeq ($(CONFIG_ARCH_SDM450), y)

		include $(AUDIO_ROOT)/config/sdm450auto.conf

		export

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

	endif

	ifeq ($(CONFIG_ARCH_SDM439), y)

		include $(AUDIO_ROOT)/config/sdm450auto.conf

		export

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

	endif

	ifeq ($(CONFIG_ARCH_MSM8917), y)

		include $(AUDIO_ROOT)/config/sdm450auto.conf

		export

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

	endif

endif



# As per target team, build is done as follows:
@@ -170,6 +185,17 @@ ifdef CONFIG_SND_SOC_CPE 
	CPE_LSM_OBJS += msm-cpe-lsm.o

endif



# for SDM450 internal codec sound card driver

ifdef CONFIG_SND_SOC_SDM450

	MACHINE_OBJS += msm8952.o

endif



# for SDM450 external codec sound card driver

ifdef CONFIG_SND_SOC_EXT_CODEC_SDM450

	MACHINE_EXT_OBJS += msm8952-slimbus.o

	MACHINE_EXT_OBJS += msm8952-dai-links.o

endif



ifdef CONFIG_SND_SOC_QDSP6V2

	PLATFORM_OBJS += msm-audio-effects-q6-v2.o

	PLATFORM_OBJS += msm-compress-q6-v2.o
@@ -254,6 +280,12 @@ endif 
obj-$(CONFIG_SND_SOC_QDSP6V2) += platform_dlkm.o

platform_dlkm-y := $(PLATFORM_OBJS)



obj-$(CONFIG_SND_SOC_SDM450) += machine_dlkm.o

machine_dlkm-y := $(MACHINE_OBJS)



obj-$(CONFIG_SND_SOC_EXT_CODEC_SDM450) += machine_ext_dlkm.o

machine_ext_dlkm-y := $(MACHINE_EXT_OBJS)



obj-$(CONFIG_SND_SOC_SM8150) += machine_dlkm.o

machine_dlkm-y := $(MACHINE_OBJS)

asoc/codecs/Android.mk

+9 −4
Original line number Diff line number Diff line
@@ -39,9 +39,14 @@ ifeq ($(call is-board-platform,sdm660),true) 
AUDIO_SELECT  := CONFIG_SND_SOC_SDM660=m

endif



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

AUDIO_SELECT  += CONFIG_SND_SOC_SDM450=m

AUDIO_SELECT  += CONFIG_SND_SOC_EXT_CODEC_SDM450=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 sdm660),true)

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



LOCAL_PATH := $(call my-dir)
@@ -85,7 +90,7 @@ LOCAL_MODULE_DEBUG_ENABLE := true 
LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)

include $(DLKM_DIR)/AndroidKernelModule.mk

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

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

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

include $(CLEAR_VARS)

LOCAL_MODULE              := $(AUDIO_CHIPSET)_wcd_cpe.ko

LOCAL_MODULE_KBUILD_NAME  := wcd_cpe_dlkm.ko
@@ -105,7 +110,7 @@ LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) 
include $(DLKM_DIR)/AndroidKernelModule.mk

endif

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

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

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

include $(CLEAR_VARS)

LOCAL_MODULE              := $(AUDIO_CHIPSET)_wcd9335.ko

LOCAL_MODULE_KBUILD_NAME  := wcd9335_dlkm.ko
@@ -125,7 +130,7 @@ LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) 
include $(DLKM_DIR)/AndroidKernelModule.mk

endif

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

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

ifeq ($(call is-board-platform-in-list, bengal msm8953 msm8937),true)

include $(CLEAR_VARS)

LOCAL_MODULE              := $(AUDIO_CHIPSET)_wsa881x_analog.ko

LOCAL_MODULE_KBUILD_NAME  := wsa881x_analog_dlkm.ko