Commit 95b5fa1a authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'topic/adsp' of... 

Merge branch 'topic/adsp' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-arizona
parents 2a0db307 2159ad93

sound/soc/codecs/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -146,6 +146,11 @@ config SND_SOC_WM_HUBS 
	default y if SND_SOC_WM8993=y || SND_SOC_WM8994=y

	default m if SND_SOC_WM8993=m || SND_SOC_WM8994=m



config SND_SOC_WM_ADSP

	tristate

	default y if SND_SOC_WM2200=y

	default m if SND_SOC_WM2200=m



config SND_SOC_AB8500_CODEC

	tristate

sound/soc/codecs/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ snd-soc-twl6040-objs := twl6040.o 
snd-soc-uda134x-objs := uda134x.o

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

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

snd-soc-wm-adsp-objs := wm_adsp.o

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

snd-soc-wm1250-ev1-objs := wm1250-ev1.o

snd-soc-wm2000-objs := wm2000.o
@@ -229,6 +230,7 @@ obj-$(CONFIG_SND_SOC_WM9090) += snd-soc-wm9090.o 
obj-$(CONFIG_SND_SOC_WM9705)	+= snd-soc-wm9705.o

obj-$(CONFIG_SND_SOC_WM9712)	+= snd-soc-wm9712.o

obj-$(CONFIG_SND_SOC_WM9713)	+= snd-soc-wm9713.o

obj-$(CONFIG_SND_SOC_WM_ADSP)	+= snd-soc-wm-adsp.o

obj-$(CONFIG_SND_SOC_WM_HUBS)	+= snd-soc-wm-hubs.o



# Amp

sound/soc/codecs/wm2200.c

+601 −33

File changed.

Preview size limit exceeded, changes collapsed.

sound/soc/codecs/wm_adsp.c

0 → 100644
+571 −0

File added.

Preview size limit exceeded, changes collapsed.

sound/soc/codecs/wm_adsp.h

0 → 100644
+54 −0

File added.

Preview size limit exceeded, changes collapsed.