summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2006-10-06 18:38:37 +0200
committerJaroslav Kysela <perex@suse.cz>2007-02-09 09:00:25 +0100
commit7f137ab673124ee0a210ab5b74c1f7234d6145fa (patch)
tree8bd5c9718a0c4d98a64a80a42ff000599382fee7
parentdbc6b6ad767c86907db373e85139b0e975ba7599 (diff)
downloadlinux-3.10-7f137ab673124ee0a210ab5b74c1f7234d6145fa.tar.gz
linux-3.10-7f137ab673124ee0a210ab5b74c1f7234d6145fa.tar.bz2
linux-3.10-7f137ab673124ee0a210ab5b74c1f7234d6145fa.zip
[ALSA] ASoC codecs: build files
This patch adds an ASoC Makefile and Kconfig for the WM8731, WM8750 and WM9712 codecs. Signed-off-by: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Liam Girdwood <liam.girdwood@wolfsonmicro.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
-rw-r--r--sound/soc/Kconfig6
-rw-r--r--sound/soc/Makefile2
-rw-r--r--sound/soc/codecs/Kconfig15
-rw-r--r--sound/soc/codecs/Makefile9
4 files changed, 31 insertions, 1 deletions
diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig
index 200709f4b70..288bad30b21 100644
--- a/sound/soc/Kconfig
+++ b/sound/soc/Kconfig
@@ -5,6 +5,9 @@
menu "SoC audio support"
depends on SND!=n
+config SND_SOC_AC97_BUS
+ bool
+
config SND_SOC
tristate "SoC audio support"
---help---
@@ -16,4 +19,7 @@ config SND_SOC
This SoC audio support can also be built as a module. If so, the module
will be called snd-soc-core.
+# Supported codecs
+source "sound/soc/codecs/Kconfig"
+
endmenu
diff --git a/sound/soc/Makefile b/sound/soc/Makefile
index b211ee63fd7..3dd4f20c5ec 100644
--- a/sound/soc/Makefile
+++ b/sound/soc/Makefile
@@ -1,4 +1,4 @@
snd-soc-core-objs := soc-core.o soc-dapm.o
obj-$(CONFIG_SND_SOC) += snd-soc-core.o
-
+obj-$(CONFIG_SND_SOC) += codecs/
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
new file mode 100644
index 00000000000..78ac2688e12
--- /dev/null
+++ b/sound/soc/codecs/Kconfig
@@ -0,0 +1,15 @@
+config SND_SOC_AC97_CODEC
+ tristate
+ depends SND_SOC
+
+config SND_SOC_WM8731
+ tristate
+ depends SND_SOC
+
+config SND_SOC_WM8750
+ tristate
+ depends SND_SOC
+
+config SND_SOC_WM9712
+ tristate
+ depends SND_SOC
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
new file mode 100644
index 00000000000..3249a6e4f1d
--- /dev/null
+++ b/sound/soc/codecs/Makefile
@@ -0,0 +1,9 @@
+snd-soc-ac97-objs := ac97.o
+snd-soc-wm8731-objs := wm8731.o
+snd-soc-wm8750-objs := wm8750.o
+snd-soc-wm9712-objs := wm9712.o
+
+obj-$(CONFIG_SND_SOC_AC97_CODEC) += snd-soc-ac97.o
+obj-$(CONFIG_SND_SOC_WM8731) += snd-soc-wm8731.o
+obj-$(CONFIG_SND_SOC_WM8750) += snd-soc-wm8750.o
+obj-$(CONFIG_SND_SOC_WM9712) += snd-soc-wm9712.o