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

Commit 5fddb8d5 authored by Meng Wang's avatar Meng Wang Committed by Vidyakumar Athota
Browse files

ASoC: enable audio modules for msmnile 



Add audio config files and Change Android.mk, Makefile
and Kbuild to enable audio modules for msmnile target.

Change-Id: If6acabe2cd2074d688b810de3f48e6c60dfe9d22
Signed-off-by: default avatarMeng Wang <mwang@codeaurora.org>
Signed-off-by: default avatarVidyakumar Athota <vathota@codeaurora.org>
parent ac5bb48a

Android.mk

+1 −1
Original line number 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



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

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

$(shell mkdir -p $(UAPI_OUT)/linux;)

$(shell mkdir -p $(UAPI_OUT)/sound;)

$(shell rm -rf $(OUT)/obj/vendor/qcom/opensource/audio-kernel/ipc/Module.symvers)

Makefile

+8 −0
Original line number Diff line number Diff line
@@ -11,6 +11,10 @@ ifeq ($(CONFIG_ARCH_SDXPOORWILLS), y) 
include $(srctree)/techpack/audio/config/sdxpoorwillsauto.conf

export

endif

ifeq ($(CONFIG_ARCH_SDM855), y)

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

export

endif



# Use USERINCLUDE when you must reference the UAPI directories only.

USERINCLUDE     += \
@@ -34,6 +38,10 @@ ifeq ($(CONFIG_ARCH_SDXPOORWILLS), y) 
LINUXINCLUDE    += \

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

endif

ifeq ($(CONFIG_ARCH_SDM855), y)

LINUXINCLUDE    += \

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

endif



obj-y += asoc/

obj-y += dsp/

asoc/Android.mk

+6 −1
Original line number Diff line number Diff line
@@ -13,9 +13,14 @@ TARGET := sdm670 
AUDIO_SELECT  := CONFIG_SND_SOC_SDM670=m

endif



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

TARGET := msmnile

AUDIO_SELECT  := CONFIG_SND_SOC_SDM855=m

endif



AUDIO_CHIPSET := audio

# Build/Package only in case of supported target

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

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



LOCAL_PATH := $(call my-dir)

asoc/Kbuild

+18 −5
Original line number Diff line number Diff line
@@ -30,6 +30,11 @@ ifeq ($(KERNEL_BUILD), 0) 
		export

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

	endif

	ifeq ($(CONFIG_ARCH_SDM855), y)

		include $(AUDIO_ROOT)/config/sdm855auto.conf

		export

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

	endif

endif



# As per target team, build is done as follows:
@@ -80,6 +85,11 @@ ifdef CONFIG_SND_SOC_MACHINE_SDM845 
	MACHINE_OBJS += sdm845.o

endif



# for SDM855 sound card driver

ifdef CONFIG_SND_SOC_SDM855

	MACHINE_OBJS += sdm855.o

endif



ifdef CONFIG_SND_SOC_CPE

	CPE_LSM_OBJS += msm-cpe-lsm.o

endif
@@ -152,11 +162,11 @@ EXTRA_CFLAGS += -Wheader-guard 
endif



ifeq ($(KERNEL_BUILD), 0)

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

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/sdm660_cdc/Module.symvers

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

KBUILD_EXTRA_SYMBOLS +=$(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/dsp/Module.symvers

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

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

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

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

endif

ifeq ($(KERNEL_BUILD), 1)

	obj-y += codecs/
@@ -168,6 +178,9 @@ platform_dlkm-y := $(PLATFORM_OBJS) 
obj-$(CONFIG_SND_SOC_MACHINE_SDM845) += machine_dlkm.o

machine_dlkm-y := $(MACHINE_OBJS)



obj-$(CONFIG_SND_SOC_SDM855) += machine_dlkm.o

machine_dlkm-y := $(MACHINE_OBJS)



obj-$(CONFIG_SND_SOC_EXT_CODEC) += machine_dlkm.o

machine_dlkm-y := $(MACHINE_OBJS)

asoc/codecs/Android.mk

+5 −1
Original line number Diff line number Diff line
@@ -11,9 +11,13 @@ ifeq ($(call is-board-platform-in-list,msm8953 sdm670 qcs605),true) 
AUDIO_SELECT  := CONFIG_SND_SOC_SDM670=m

endif



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

AUDIO_SELECT  := CONFIG_SND_SOC_SDM855=m

endif



AUDIO_CHIPSET := audio

# Build/Package only in case of supported target

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

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



LOCAL_PATH := $(call my-dir)