Merge "ASoC: Add support for qcs605 for dlkm" (7cb56be5) · Commits · e / devices / android_kernel_fairphone_FP3

Android.mk

+2 −2

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

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

	ifeq ($(call is-board-platform-in-list,sdm845 sdm670),true)		ifeq ($(call is-board-platform-in-list,sdm845 sdm670 qcs605),true)
	$(shell mkdir -p $(UAPI_OUT)/linux;)		$(shell mkdir -p $(UAPI_OUT)/linux;)
	$(shell mkdir -p $(UAPI_OUT)/sound;)		$(shell mkdir -p $(UAPI_OUT)/sound;)

	@@ -16,7 +16,7 @@ include $(MY_LOCAL_PATH)/asoc/codecs/Android.mk
	include $(MY_LOCAL_PATH)/asoc/codecs/wcd934x/Android.mk		include $(MY_LOCAL_PATH)/asoc/codecs/wcd934x/Android.mk
	endif		endif

	ifeq ($(call is-board-platform,sdm670),true)		ifeq ($(call is-board-platform-in-list,sdm670 qcs605),true)
	include $(MY_LOCAL_PATH)/asoc/codecs/sdm660_cdc/Android.mk		include $(MY_LOCAL_PATH)/asoc/codecs/sdm660_cdc/Android.mk
	include $(MY_LOCAL_PATH)/asoc/codecs/msm_sdw/Android.mk		include $(MY_LOCAL_PATH)/asoc/codecs/msm_sdw/Android.mk
	endif		endif

asoc/Android.mk

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -8,14 +8,14 @@ TARGET := sdm845
	AUDIO_SELECT := CONFIG_SND_SOC_SDM845=m		AUDIO_SELECT := CONFIG_SND_SOC_SDM845=m
	endif		endif

	ifeq ($(call is-board-platform,sdm670),true)		ifeq ($(call is-board-platform-in-list,sdm670 qcs605),true)
	TARGET := sdm670		TARGET := sdm670
	AUDIO_SELECT := CONFIG_SND_SOC_SDM670=m		AUDIO_SELECT := CONFIG_SND_SOC_SDM670=m
	endif		endif

	AUDIO_CHIPSET := audio		AUDIO_CHIPSET := audio
	# Build/Package only in case of supported target		# Build/Package only in case of supported target
	ifeq ($(call is-board-platform-in-list,sdm845 sdm670),true)		ifeq ($(call is-board-platform-in-list,sdm845 sdm670 qcs605),true)

	LOCAL_PATH := $(call my-dir)		LOCAL_PATH := $(call my-dir)

	@@ -50,7 +50,7 @@ LOCAL_MODULE_DEBUG_ENABLE := true
	LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)		LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
	include $(DLKM_DIR)/AndroidKernelModule.mk		include $(DLKM_DIR)/AndroidKernelModule.mk
	###########################################################		###########################################################
	ifeq ($(call is-board-platform,sdm670),true)		ifeq ($(call is-board-platform-in-list,sdm670 qcs605),true)
	include $(CLEAR_VARS)		include $(CLEAR_VARS)
	LOCAL_MODULE := $(AUDIO_CHIPSET)_cpe_lsm.ko		LOCAL_MODULE := $(AUDIO_CHIPSET)_cpe_lsm.ko
	LOCAL_MODULE_KBUILD_NAME := cpe_lsm_dlkm.ko		LOCAL_MODULE_KBUILD_NAME := cpe_lsm_dlkm.ko

asoc/codecs/Android.mk

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -7,13 +7,13 @@ ifeq ($(call is-board-platform,sdm845),true)
	AUDIO_SELECT := CONFIG_SND_SOC_SDM845=m		AUDIO_SELECT := CONFIG_SND_SOC_SDM845=m
	endif		endif

	ifeq ($(call is-board-platform,sdm670),true)		ifeq ($(call is-board-platform-in-list,sdm670 qcs605),true)
	AUDIO_SELECT := CONFIG_SND_SOC_SDM670=m		AUDIO_SELECT := CONFIG_SND_SOC_SDM670=m
	endif		endif

	AUDIO_CHIPSET := audio		AUDIO_CHIPSET := audio
	# Build/Package only in case of supported target		# Build/Package only in case of supported target
	ifeq ($(call is-board-platform-in-list,sdm845 sdm670),true)		ifeq ($(call is-board-platform-in-list,sdm845 sdm670 qcs605),true)

	LOCAL_PATH := $(call my-dir)		LOCAL_PATH := $(call my-dir)

	@@ -56,7 +56,7 @@ LOCAL_MODULE_DEBUG_ENABLE := true
	LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)		LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
	include $(DLKM_DIR)/AndroidKernelModule.mk		include $(DLKM_DIR)/AndroidKernelModule.mk
	###########################################################		###########################################################
	ifeq ($(call is-board-platform,sdm670),true)		ifeq ($(call is-board-platform-in-list,sdm670 qcs605),true)
	include $(CLEAR_VARS)		include $(CLEAR_VARS)
	LOCAL_MODULE := $(AUDIO_CHIPSET)_wcd_cpe.ko		LOCAL_MODULE := $(AUDIO_CHIPSET)_wcd_cpe.ko
	LOCAL_MODULE_KBUILD_NAME := wcd_cpe_dlkm.ko		LOCAL_MODULE_KBUILD_NAME := wcd_cpe_dlkm.ko
	@@ -74,7 +74,7 @@ LOCAL_MODULE_DEBUG_ENABLE := true
	LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)		LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
	include $(DLKM_DIR)/AndroidKernelModule.mk		include $(DLKM_DIR)/AndroidKernelModule.mk
	###########################################################		###########################################################
	ifeq ($(call is-board-platform,sdm670),true)		ifeq ($(call is-board-platform-in-list,sdm670 qcs605),true)
	include $(CLEAR_VARS)		include $(CLEAR_VARS)
	LOCAL_MODULE := $(AUDIO_CHIPSET)_wcd9335.ko		LOCAL_MODULE := $(AUDIO_CHIPSET)_wcd9335.ko
	LOCAL_MODULE_KBUILD_NAME := wcd9335_dlkm.ko		LOCAL_MODULE_KBUILD_NAME := wcd9335_dlkm.ko

asoc/codecs/msm_sdw/Android.mk

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4,7 +4,7 @@

	AUDIO_CHIPSET := audio		AUDIO_CHIPSET := audio
	# Build/Package only in case of supported target		# Build/Package only in case of supported target
	ifeq ($(call is-board-platform,sdm670),true)		ifeq ($(call is-board-platform-in-list,sdm670 qcs605),true)
	AUDIO_SELECT := CONFIG_SND_SOC_SDM670=m		AUDIO_SELECT := CONFIG_SND_SOC_SDM670=m

	LOCAL_PATH := $(call my-dir)		LOCAL_PATH := $(call my-dir)

asoc/codecs/sdm660_cdc/Android.mk

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4,7 +4,7 @@

	AUDIO_CHIPSET := audio		AUDIO_CHIPSET := audio
	# Build/Package only in case of supported target		# Build/Package only in case of supported target
	ifeq ($(call is-board-platform,sdm670),true)		ifeq ($(call is-board-platform-in-list,sdm670 qcs605),true)

	LOCAL_PATH := $(call my-dir)		LOCAL_PATH := $(call my-dir)