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

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

Merge "audio-kernel: enable wsa883x compilation on sxr2130"

parents d1858930 c386af86

Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ $(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codec 
include $(MY_LOCAL_PATH)/asoc/codecs/wcd937x/Android.mk

endif



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

ifeq ($(call is-board-platform-in-list, kona 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

Makefile.am

+4 −0
Original line number Diff line number Diff line
@@ -48,6 +48,10 @@ obj-m += asoc/codecs/bolero/ 
obj-m += asoc/codecs/wcd938x/

endif



ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), sxr2130))

obj-m += asoc/codecs/wsa883x/

endif



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

obj-m += asoc/codecs/sdm660_cdc/

endif

asoc/codecs/wsa883x/Android.mk

+4 −1
Original line number Diff line number Diff line
@@ -6,10 +6,13 @@ 
ifeq ($(call is-board-platform,lahaina),true)

AUDIO_SELECT  := CONFIG_SND_SOC_LAHAINA=m

endif

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

AUDIO_SELECT  := CONFIG_SND_SOC_KONA=m

endif



AUDIO_CHIPSET := audio

# Build/Package only in case of supported target

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

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



LOCAL_PATH := $(call my-dir)

asoc/codecs/wsa883x/Kbuild

+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,10 @@ ifeq ($(KERNEL_BUILD), 0) 
		include $(AUDIO_ROOT)/config/litoauto.conf

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

	endif

        ifeq ($(CONFIG_ARCH_KONA), y)

                include $(AUDIO_ROOT)/config/konaauto.conf

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

        endif

endif



# As per target team, build is done as follows:

asoc/codecs/wsa883x/wsa883x.c

+1 −1
Original line number Diff line number Diff line
@@ -1557,7 +1557,7 @@ static int wsa883x_swr_probe(struct swr_device *pdev) 
	ret = swr_get_logical_dev_num(pdev, pdev->addr, &devnum);

	if (ret) {

		dev_err(&pdev->dev,

			"%s get devnum %d for dev addr %lx failed\n",

			"%s get devnum %d for dev addr %llx failed\n",

			__func__, devnum, pdev->addr);

		goto dev_err;

	}