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

Commit 41136341 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 9c2238e1 on remote branch 

Change-Id: Idaa97bd4d672189cd61a2c9380678bb6766c1ff0
parents b23d39e0 9c2238e1

Makefile

+7 −1
Original line number Diff line number Diff line
@@ -30,6 +30,9 @@ endif 
ifeq ($(CONFIG_ARCH_SA6155), y)

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

endif

ifeq ($(CONFIG_ARCH_SM6150), y)

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

endif

endif

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

USERINCLUDE     += \
@@ -79,7 +82,10 @@ ifeq ($(CONFIG_ARCH_SA6155), y) 
LINUXINCLUDE    += \

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

endif



ifeq ($(CONFIG_ARCH_SM6150), y)

LINUXINCLUDE    += \

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

endif

obj-y += soc/

obj-y += dsp/

obj-y += ipc/

Makefile.am

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ obj-m += asoc/ 
obj-m += asoc/codecs/

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

obj-m += asoc/codecs/wcd934x/

KBUILD_CFLAGS += -Wno-error

endif

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

obj-m += asoc/codecs/bolero/

asoc/Kbuild

+12 −5
Original line number Diff line number Diff line
@@ -136,7 +136,6 @@ endif 
# for SM6150 sound card driver

ifdef CONFIG_SND_SOC_SM6150

	MACHINE_OBJS += sm6150.o

	MACHINE_OBJS += machine_615x_init.o

endif



# For sa6155 sound card driver
@@ -211,12 +210,20 @@ ifdef CONFIG_SND_SOC_QDSP6V2 
	PLATFORM_OBJS += msm-pcm-loopback-v2.o

	PLATFORM_OBJS += msm-pcm-q6-noirq.o

	PLATFORM_OBJS += msm-pcm-q6-v2.o

	ifeq (y,$(findstring y,$(CONFIG_QTI_QUIN_GVM) $(CONFIG_PLATFORM_AUTO)))

		PLATFORM_OBJS += msm-pcm-routing-auto.o

	else

		PLATFORM_OBJS += msm-pcm-routing-v2.o

		PLATFORM_OBJS += msm-pcm-voice-v2.o

		PLATFORM_OBJS += msm-pcm-voip-v2.o

	endif

	PLATFORM_OBJS += msm-transcode-loopback-q6-v2.o

	ifeq (y,$(findstring y,$(CONFIG_QTI_QUIN_GVM) $(CONFIG_PLATFORM_AUTO)))

		PLATFORM_OBJS += platform_init_auto.o

	else

		PLATFORM_OBJS += platform_init.o

	endif

endif

ifdef CONFIG_WCD9XXX_CODEC_CORE

	PLATFORM_OBJS += msm-dai-slim.o

endif

asoc/bengal.c

100644 → 100755
+11 −0
Original line number Diff line number Diff line
@@ -4983,6 +4983,17 @@ static struct snd_soc_dai_link msm_common_misc_fe_dai_links[] = { 
		.ops = &msm_cdc_dma_be_ops,

		SND_SOC_DAILINK_REG(tx_cdcdma5_tx),

	},

	{/* hw:x,39 */

		.name = "TX4_CDC_DMA Hostless",

		.stream_name = "TX4_CDC_DMA Hostless",

		.dynamic = 1,

		.dpcm_capture = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			    SND_SOC_DPCM_TRIGGER_POST},

		.no_host_mode = SND_SOC_DAI_LINK_NO_HOST,

		.ignore_suspend = 1,

		SND_SOC_DAILINK_REG(tx4_cdcdma_hostless),

	},

};



static struct snd_soc_dai_link msm_common_be_dai_links[] = {

asoc/codecs/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ ifdef CONFIG_WCD9XXX_CODEC_CORE 
	WCD9XXX_OBJS += wcd9xxx-resmgr-v2.o

	WCD9XXX_OBJS += wcd-dsp-utils.o

	WCD9XXX_OBJS += wcd-dsp-mgr.o

	WCD9XXX_OBJS += wcd-clsh.o

else

	WCD9XXX_OBJS += wcd-clsh.o

endif