aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2006-10-06 12:38:37 -0400
committerJaroslav Kysela <perex@suse.cz>2007-02-09 03:00:25 -0500
commit7f137ab673124ee0a210ab5b74c1f7234d6145fa (patch)
tree8bd5c9718a0c4d98a64a80a42ff000599382fee7 /sound
parentdbc6b6ad767c86907db373e85139b0e975ba7599 (diff)
[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>
Diffstat (limited to 'sound')
-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 200709f4b708..288bad30b213 100644
--- a/sound/soc/Kconfig
+++ b/sound/soc/Kconfig
@@ -5,6 +5,9 @@
5menu "SoC audio support" 5menu "SoC audio support"
6 depends on SND!=n 6 depends on SND!=n
7 7
8config SND_SOC_AC97_BUS
9 bool
10
8config SND_SOC 11config SND_SOC
9 tristate "SoC audio support" 12 tristate "SoC audio support"
10 ---help--- 13 ---help---
@@ -16,4 +19,7 @@ config SND_SOC
16 This SoC audio support can also be built as a module. If so, the module 19 This SoC audio support can also be built as a module. If so, the module
17 will be called snd-soc-core. 20 will be called snd-soc-core.
18 21
22# Supported codecs
23source "sound/soc/codecs/Kconfig"
24
19endmenu 25endmenu
diff --git a/sound/soc/Makefile b/sound/soc/Makefile
index b211ee63fd76..3dd4f20c5ecf 100644
--- a/sound/soc/Makefile
+++ b/sound/soc/Makefile
@@ -1,4 +1,4 @@
1snd-soc-core-objs := soc-core.o soc-dapm.o 1snd-soc-core-objs := soc-core.o soc-dapm.o
2 2
3obj-$(CONFIG_SND_SOC) += snd-soc-core.o 3obj-$(CONFIG_SND_SOC) += snd-soc-core.o
4 4obj-$(CONFIG_SND_SOC) += codecs/
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
new file mode 100644
index 000000000000..78ac2688e124
--- /dev/null
+++ b/sound/soc/codecs/Kconfig
@@ -0,0 +1,15 @@
1config SND_SOC_AC97_CODEC
2 tristate
3 depends SND_SOC
4
5config SND_SOC_WM8731
6 tristate
7 depends SND_SOC
8
9config SND_SOC_WM8750
10 tristate
11 depends SND_SOC
12
13config SND_SOC_WM9712
14 tristate
15 depends SND_SOC
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
new file mode 100644
index 000000000000..3249a6e4f1d0
--- /dev/null
+++ b/sound/soc/codecs/Makefile
@@ -0,0 +1,9 @@
1snd-soc-ac97-objs := ac97.o
2snd-soc-wm8731-objs := wm8731.o
3snd-soc-wm8750-objs := wm8750.o
4snd-soc-wm9712-objs := wm9712.o
5
6obj-$(CONFIG_SND_SOC_AC97_CODEC) += snd-soc-ac97.o
7obj-$(CONFIG_SND_SOC_WM8731) += snd-soc-wm8731.o
8obj-$(CONFIG_SND_SOC_WM8750) += snd-soc-wm8750.o
9obj-$(CONFIG_SND_SOC_WM9712) += snd-soc-wm9712.o