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

Commit d6107d0b authored by Meng Wang's avatar Meng Wang
Browse files

asoc: clean up audio drivers and remove unused files 



Clean up audio drivers and remove unused files.

Change-Id: I50559ac3c5f4a1f4336e4480cd3ff235d015441e
Signed-off-by: default avatarMeng Wang <mengw@codeaurora.org>
parent 53ad8477

Android.mk

+2 −14
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,msm8953 sdm845 sdm670 qcs605 msmnile $(MSMSTEPPE) $(TRINKET)),true)

ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE) $(TRINKET)),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)
@@ -24,7 +24,7 @@ include $(MY_LOCAL_PATH)/asoc/codecs/Android.mk 
include $(MY_LOCAL_PATH)/asoc/codecs/wcd934x/Android.mk

endif



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

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

$(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
@@ -35,15 +35,3 @@ include $(MY_LOCAL_PATH)/asoc/codecs/bolero/Android.mk 
$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/wcd937x/Module.symvers)

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

endif
 


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



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

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

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

endif

Makefile

+0 −16
Original line number Diff line number Diff line 
# auto-detect subdirs

ifeq ($(CONFIG_ARCH_SDM845), y)

include $(srctree)/techpack/audio/config/sdm845auto.conf

export

endif

ifeq ($(CONFIG_ARCH_SDM670), y)

include $(srctree)/techpack/audio/config/sdm670auto_static.conf

export

endif

ifeq ($(CONFIG_ARCH_SDXPOORWILLS), y)

include $(srctree)/techpack/audio/config/sdxpoorwillsauto.conf

export
@@ -30,14 +22,6 @@ LINUXINCLUDE += \ 
                -I$(srctree)/techpack/audio/include/uapi \

                -I$(srctree)/techpack/audio/include



ifeq ($(CONFIG_ARCH_SDM845), y)

LINUXINCLUDE    += \

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

endif

ifeq ($(CONFIG_ARCH_SDM670), y)

LINUXINCLUDE    += \

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

endif

ifeq ($(CONFIG_ARCH_SDXPOORWILLS), y)

LINUXINCLUDE    += \

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

Makefile.am

+1 −16
Original line number Diff line number Diff line
@@ -11,15 +11,6 @@ AUDIO_KERNEL_HEADERS_PATH1 = $(shell ls ./include/uapi/linux/*.h) 
AUDIO_KERNEL_HEADERS_PATH2 =  $(shell ls ./include/uapi/linux/mfd/wcd9xxx/*.h)

AUDIO_KERNEL_HEADERS_PATH3 =  $(shell ls ./include/uapi/sound/*.h)



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

KBUILD_OPTIONS += CONFIG_ARCH_SDM670=y

endif

ifeq ($(TARGET_SUPPORT),sdm845)

KBUILD_OPTIONS += CONFIG_ARCH_SDM845=y

endif

ifeq ($(TARGET_SUPPORT),apq8053)

KBUILD_OPTIONS += CONFIG_ARCH_SDM450=y

endif

ifeq ($(TARGET_SUPPORT),qcs40x)

KBUILD_OPTIONS += CONFIG_ARCH_QCS405=y

endif
@@ -33,15 +24,9 @@ obj-m += dsp/codecs/ 
obj-m += soc/

obj-m += asoc/

obj-m += asoc/codecs/

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

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

obj-m += asoc/codecs/wcd934x/

endif

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

obj-m += asoc/codecs/sdm660_cdc/

endif

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

obj-m += asoc/codecs/msm_sdw/

endif

ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), qcs40x))

obj-m += asoc/codecs/bolero/

obj-m += asoc/codecs/csra66x0/

asoc/Android.mk

+2 −12
Original line number Diff line number Diff line
@@ -3,16 +3,6 @@ 
# Assume no targets will be supported



# Check if this driver needs be built for current target

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

TARGET := sdm845

AUDIO_SELECT  := CONFIG_SND_SOC_SDM845=m

endif



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

TARGET := sdm670

AUDIO_SELECT  := CONFIG_SND_SOC_SDM670=m

endif



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

TARGET := msmnile

AUDIO_SELECT  := CONFIG_SND_SOC_SM8150=m
@@ -30,7 +20,7 @@ endif 


AUDIO_CHIPSET := audio

# Build/Package only in case of supported target

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

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



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

include $(DLKM_DIR)/AndroidKernelModule.mk

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

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

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

include $(CLEAR_VARS)

LOCAL_MODULE              := $(AUDIO_CHIPSET)_cpe_lsm.ko

LOCAL_MODULE_KBUILD_NAME  := cpe_lsm_dlkm.ko

asoc/Kbuild

+0 −48
Original line number Diff line number Diff line
@@ -14,21 +14,6 @@ ifeq ($(KERNEL_BUILD), 1) 
endif



ifeq ($(KERNEL_BUILD), 0)

	ifeq ($(CONFIG_ARCH_SDM845), y)

		include $(AUDIO_ROOT)/config/sdm845auto.conf

		export

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

	endif

	ifeq ($(CONFIG_ARCH_SDM670), y)

		include $(AUDIO_ROOT)/config/sdm670auto.conf

		export

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

	endif

	ifeq ($(CONFIG_ARCH_SDM450), y)

		include $(AUDIO_ROOT)/config/sdm670auto.conf

		export

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

	endif

	ifeq ($(CONFIG_ARCH_SM8150), y)

		include $(AUDIO_ROOT)/config/sm8150auto.conf

		export
@@ -82,28 +67,6 @@ COMMON_INC := -I$(AUDIO_ROOT)/$(COMMON_DIR) 


############ ASoC Drivers ############





# for SDM6xx sound card driver

ifdef CONFIG_SND_SOC_SDM670

	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



# for SDM845 sound card driver

ifdef CONFIG_SND_SOC_MACHINE_SDM845

	MACHINE_OBJS += sdm845.o

endif



# for SM8150 sound card driver

ifdef CONFIG_SND_SOC_SM8150

	MACHINE_OBJS += sa8155.o
@@ -197,8 +160,6 @@ 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/
@@ -207,9 +168,6 @@ endif 
obj-$(CONFIG_SND_SOC_QDSP6V2) += platform_dlkm.o

platform_dlkm-y := $(PLATFORM_OBJS)



obj-$(CONFIG_SND_SOC_MACHINE_SDM845) += machine_dlkm.o

machine_dlkm-y := $(MACHINE_OBJS)



obj-$(CONFIG_SND_SOC_SM8150) += machine_dlkm.o

machine_dlkm-y := $(MACHINE_OBJS)
@@ -219,12 +177,6 @@ machine_dlkm-y := $(MACHINE_OBJS) 
obj-$(CONFIG_SND_SOC_QCS405) += 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)