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

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

Merge "ASoC: wcd: Add dependency on WCD9330_CODEC"

parents 52213ea9 af778bd5
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -625,6 +625,7 @@ config SND_SOC_WCD9320

config SND_SOC_WCD9330
        tristate
	depends on WCD9330_CODEC

config SND_SOC_WCD9335
        tristate
@@ -644,6 +645,10 @@ config SND_SOC_WCD9XXX
	tristate
	default y if SND_SOC_WCD9320=y || SND_SOC_WCD9330=y || SND_SOC_WCD9335=y

config SND_SOC_WCD9XXX_V2
	tristate
	default y if SND_SOC_WCD9335=y

config SND_SOC_WCD_CPE
	tristate
	default y if SND_SOC_WCD9330=y
+3 −1
Original line number Diff line number Diff line
@@ -115,8 +115,9 @@ snd-soc-uda134x-objs := uda134x.o
snd-soc-uda1380-objs := uda1380.o
snd-soc-wcd9320-objs := wcd9320.o wcd9320-tables.o
snd-soc-wcd9330-objs := wcd9330.o wcd9330-tables.o wcdcal-hwdep.o
snd-soc-wcd9335-objs := wcd9335.o wcd9xxx-common-v2.o wcd9xxx-resmgr-v2.o
snd-soc-wcd9335-objs := wcd9335.o
snd-soc-wcd9xxx-objs := wcd9xxx-resmgr.o wcd9xxx-mbhc.o wcd9xxx-common.o
snd-soc-wcd9xxx-v2-objs := wcd9xxx-common-v2.o wcd9xxx-resmgr-v2.o
audio-ext-clock-objs := audio-ext-clk.o
snd-soc-wcd-cpe-objs := wcd_cpe_services.o wcd_cpe_core.o
snd-soc-wsa881x-objs := wsa881x.o wsa881x-tables.o wsa881x-regmap.o wsa881x-temp-sensor.o
@@ -305,6 +306,7 @@ obj-$(CONFIG_SND_SOC_WCD9330) += snd-soc-wcd9330.o
obj-$(CONFIG_SND_SOC_WCD9335)	+= snd-soc-wcd9335.o
obj-$(CONFIG_AUDIO_EXT_CLK)	+= audio-ext-clock.o
obj-$(CONFIG_SND_SOC_WCD9XXX)   += snd-soc-wcd9xxx.o
obj-$(CONFIG_SND_SOC_WCD9XXX_V2) += snd-soc-wcd9xxx-v2.o
obj-$(CONFIG_SND_SOC_MSM8X16_WCD)	+= snd-soc-msm8952-wcd.o msm8916-wcd-irq.o
obj-$(CONFIG_SND_SOC_WCD_CPE)   += snd-soc-wcd-cpe.o
obj-$(CONFIG_SND_SOC_WCD_MBHC)  += snd-soc-wcd-mbhc.o