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

Commit 51f18552 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mdm9630: Enable audio"

parents c1db87f5 e3b56f3f
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -148,6 +148,9 @@ config ARCH_MDM9630
	select PM_DEVFREQ
	select MSM_DEVFREQ_CPUBW
	select MSM_IRQ
	select MSM_QDSP6_APRV2
	select MSM_QDSP6V2_CODECS
	select MSM_AUDIO_QDSP6V2 if SND_SOC

config ARCH_MSM8610
	bool "MSM8610"
+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@

#if defined(CONFIG_ARCH_MSM8974) \
	|| defined(CONFIG_ARCH_MSM8226) || defined(CONFIG_ARCH_MSM8610) \
	|| defined(CONFIG_ARCH_APQ8084) || defined(CONFIG_ARCH_MPQ8092)
	|| defined(CONFIG_ARCH_APQ8084) || defined(CONFIG_ARCH_MPQ8092) \
	|| defined(CONFIG_ARCH_MDM9630)

#include <sound/apr_audio-v2.h>
#include <sound/q6asm-v2.h>
+11 −0
Original line number Diff line number Diff line
@@ -217,4 +217,15 @@ config SND_SOC_MSMSAMARIUM
	 the machine drivers and the corresponding
	 DAI-links.

config SND_SOC_MDM9630
	tristate "SoC Machine driver for MDM9630 boards"
	depends on ARCH_MDM9630
	select SND_SOC_QDSP6V2
	select SND_SOC_MSM_STUB
	select SND_SOC_WCD9320
	select SND_SOC_MSM_HOSTLESS_PCM
	select SND_DYNAMIC_MINORS
	help
	 To add support for SoC audio on MDM9630 boards.

endmenu
+4 −0
Original line number Diff line number Diff line
@@ -78,3 +78,7 @@ obj-$(CONFIG_SND_SOC_APQ8084) += snd-soc-apq8084.o
#for MSM SAMARIUM sound card driver
snd-soc-msmsamarium-objs := msmsamarium.o
obj-$(CONFIG_SND_SOC_MSMSAMARIUM) += snd-soc-msmsamarium.o

#for mdm9630 sound card driver
snd-soc-mdm9630-objs := mdm9630.o
obj-$(CONFIG_SND_SOC_MDM9630) += snd-soc-mdm9630.o