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

Commit 3855c96b authored by Damir Didjusto's avatar Damir Didjusto
Browse files

ASoC: refactor wcd9320, wcd9306 objects 



Common objects for wcd9320 and wcd9306 codecs are being
compiled separately for those codecs. This makes the
compilation of both codecs in the same image impossible.
Msmsamarium will require both codecs to be compiled.
This change refactors the common objects to
enable wcd9320 and wcd9306 to be built in the same image.

Change-Id: I682adce18bad93c1d37042ea68d98c39e3f1c39d
Signed-off-by: default avatarDamir Didjusto <damird@codeaurora.org>
parent ad0ce55e

sound/soc/codecs/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -371,6 +371,10 @@ config SND_SOC_WCD9320 
config SND_SOC_WCD9306

        tristate



config SND_SOC_WCD9XXX

	tristate

	default y if SND_SOC_WCD9320=y || SND_SOC_WCD9306=y



config SND_SOC_MSM8X10_WCD

	tristate

sound/soc/codecs/Makefile

+5 −3
Original line number Diff line number Diff line
@@ -69,8 +69,9 @@ snd-soc-uda1380-objs := uda1380.o 
snd-soc-wcd9304-objs := wcd9304.o wcd9304-tables.o

snd-soc-wcd9310-objs := wcd9310.o wcd9310-tables.o

snd-soc-cs8427-objs := cs8427.o

snd-soc-wcd9320-objs := wcd9xxx-resmgr.o wcd9320.o wcd9320-tables.o wcd9xxx-mbhc.o wcd9xxx-common.o

snd-soc-wcd9306-objs := wcd9306.o wcd9306-tables.o wcd9xxx-common.o

snd-soc-wcd9320-objs := wcd9320.o wcd9320-tables.o

snd-soc-wcd9306-objs := wcd9306.o wcd9306-tables.o

snd-soc-wcd9xxx-objs := wcd9xxx-resmgr.o wcd9xxx-mbhc.o wcd9xxx-common.o

snd-soc-msm8x10-wcd-objs := msm8x10-wcd.o msm8x10-wcd-tables.o

snd-soc-wl1273-objs := wl1273.o

snd-soc-wm-adsp-objs := wm_adsp.o
@@ -204,8 +205,9 @@ obj-$(CONFIG_SND_SOC_WCD9304) += snd-soc-wcd9304.o 
obj-$(CONFIG_SND_SOC_WCD9310)	+= snd-soc-wcd9310.o

obj-$(CONFIG_SND_SOC_CS8427)	+= snd-soc-cs8427.o

obj-$(CONFIG_SND_SOC_WCD9320)	+= snd-soc-wcd9320.o

obj-$(CONFIG_SND_SOC_WCD9306)	+= snd-soc-wcd9306.o wcd9xxx-resmgr.o wcd9xxx-mbhc.o

obj-$(CONFIG_SND_SOC_WCD9306)	+= snd-soc-wcd9306.o

obj-$(CONFIG_SND_SOC_MSM8X10_WCD)	+= snd-soc-msm8x10-wcd.o wcd9xxx-resmgr.o wcd9xxx-mbhc.o

obj-$(CONFIG_SND_SOC_WCD9XXX)   += snd-soc-wcd9xxx.o

obj-$(CONFIG_SND_SOC_WL1273)	+= snd-soc-wl1273.o

obj-$(CONFIG_SND_SOC_WM0010)	+= snd-soc-wm0010.o

obj-$(CONFIG_SND_SOC_WM1250_EV1) += snd-soc-wm1250-ev1.o