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

Commit 37cfa195 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'wm8974-upstream' into for-2.6.32

parents 29e02cb3 25cbf465

sound/soc/codecs/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ config SND_SOC_ALL_CODECS 
	select SND_SOC_WM8960 if I2C

	select SND_SOC_WM8961 if I2C

	select SND_SOC_WM8971 if I2C

	select SND_SOC_WM8974 if I2C

	select SND_SOC_WM8988 if SND_SOC_I2C_AND_SPI

	select SND_SOC_WM8990 if I2C

	select SND_SOC_WM8993 if I2C
@@ -188,6 +189,9 @@ config SND_SOC_WM8961 
config SND_SOC_WM8971

	tristate



config SND_SOC_WM8974

	tristate



config SND_SOC_WM8988

	tristate

sound/soc/codecs/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ snd-soc-wm8940-objs := wm8940.o 
snd-soc-wm8960-objs := wm8960.o

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

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

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

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

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

snd-soc-wm8993-objs := wm8993.o
@@ -79,6 +80,7 @@ obj-$(CONFIG_SND_SOC_WM8776) += snd-soc-wm8776.o 
obj-$(CONFIG_SND_SOC_WM8900)	+= snd-soc-wm8900.o

obj-$(CONFIG_SND_SOC_WM8903)	+= snd-soc-wm8903.o

obj-$(CONFIG_SND_SOC_WM8971)	+= snd-soc-wm8971.o

obj-$(CONFIG_SND_SOC_WM8974)	+= snd-soc-wm8974.o

obj-$(CONFIG_SND_SOC_WM8940)	+= snd-soc-wm8940.o

obj-$(CONFIG_SND_SOC_WM8960)	+= snd-soc-wm8960.o

obj-$(CONFIG_SND_SOC_WM8961)	+= snd-soc-wm8961.o

sound/soc/codecs/wm8974.c

0 → 100644
+847 −0

File added.

Preview size limit exceeded, changes collapsed.

sound/soc/codecs/wm8974.h

0 → 100644
+99 −0

File added.

Preview size limit exceeded, changes collapsed.