Merge "ASoC: sdm660 audio changes" (73d67e66) · Commits · e / devices / android_kernel_oneplus_sm7250

Android.mk

+14 −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),true)
		ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE) $(TRINKET) kona lito bengal sdmshrike sdm660),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)
		@@ -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

+7 −1

Original line number	Diff line number	Diff line
		@@ -14,6 +14,9 @@ endif
		ifeq ($(CONFIG_ARCH_KONA), y)
		include $(srctree)/techpack/audio/config/konaauto.conf
		endif
		ifeq ($(CONFIG_ARCH_SDM660), y)
		include $(srctree)/techpack/audio/config/sdm660auto.conf
		endif

		# Use USERINCLUDE when you must reference the UAPI directories only.
		USERINCLUDE += \
		@@ -42,7 +45,10 @@ ifeq ($(CONFIG_ARCH_KONA), y)
		LINUXINCLUDE += \
		-include $(srctree)/techpack/audio/config/konaautoconf.h
		endif

		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

+8 −1

Original line number	Diff line number	Diff line
		@@ -17,6 +17,9 @@ endif
		ifeq ($(TARGET_SUPPORT), sdmsteppe)
		KBUILD_OPTIONS += CONFIG_ARCH_SM6150=y
		endif
		ifeq ($(TARGET_SUPPORT),sdm660)
		KBUILD_OPTIONS += CONFIG_ARCH_SDM660=y
		endif

		obj-m := ipc/
		obj-m += dsp/
		@@ -24,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))
		@@ -42,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)