aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/soc/Kconfig1
-rw-r--r--sound/soc/Makefile2
-rw-r--r--sound/soc/pxa/Kconfig60
-rw-r--r--sound/soc/pxa/Makefile20
4 files changed, 82 insertions, 1 deletions
diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig
index e7dab5bdc6b2..ec821a57f843 100644
--- a/sound/soc/Kconfig
+++ b/sound/soc/Kconfig
@@ -23,6 +23,7 @@ config SND_SOC
23menu "SoC Platforms" 23menu "SoC Platforms"
24depends on SND_SOC 24depends on SND_SOC
25source "sound/soc/at91/Kconfig" 25source "sound/soc/at91/Kconfig"
26source "sound/soc/pxa/Kconfig"
26endmenu 27endmenu
27 28
28# Supported codecs 29# Supported codecs
diff --git a/sound/soc/Makefile b/sound/soc/Makefile
index 3e12a1654c49..98e6f49dafc2 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
4obj-$(CONFIG_SND_SOC) += codecs/ at91/ 4obj-$(CONFIG_SND_SOC) += codecs/ at91/ pxa/
diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig
new file mode 100644
index 000000000000..a07598cdab3c
--- /dev/null
+++ b/sound/soc/pxa/Kconfig
@@ -0,0 +1,60 @@
1menu "SoC Audio for the Intel PXA2xx"
2
3config SND_PXA2XX_SOC
4 tristate "SoC Audio for the Intel PXA2xx chip"
5 depends on ARCH_PXA && SND
6 select SND_PCM
7 help
8 Say Y or M if you want to add support for codecs attached to
9 the PXA2xx AC97, I2S or SSP interface. You will also need
10 to select the audio interfaces to support below.
11
12config SND_PXA2XX_AC97
13 tristate
14 select SND_AC97_CODEC
15
16config SND_PXA2XX_SOC_AC97
17 tristate
18 select SND_AC97_BUS
19 select SND_SOC_AC97_BUS
20
21config SND_PXA2XX_SOC_I2S
22 tristate
23
24config SND_PXA2XX_SOC_CORGI
25 tristate "SoC Audio support for Sharp Zaurus SL-C7x0"
26 depends on SND_PXA2XX_SOC && PXA_SHARP_C7xx
27 select SND_PXA2XX_SOC_I2S
28 select SND_SOC_WM8731
29 help
30 Say Y if you want to add support for SoC audio on Sharp
31 Zaurus SL-C7x0 models (Corgi, Shepherd, Husky).
32
33config SND_PXA2XX_SOC_SPITZ
34 tristate "SoC Audio support for Sharp Zaurus SL-Cxx00"
35 depends on SND_PXA2XX_SOC && PXA_SHARP_Cxx00
36 select SND_PXA2XX_SOC_I2S
37 select SND_SOC_WM8750
38 help
39 Say Y if you want to add support for SoC audio on Sharp
40 Zaurus SL-Cxx00 models (Spitz, Borzoi and Akita).
41
42config SND_PXA2XX_SOC_POODLE
43 tristate "SoC Audio support for Poodle"
44 depends on SND_PXA2XX_SOC && MACH_POODLE
45 select SND_PXA2XX_SOC_I2S
46 select SND_SOC_WM8731
47 help
48 Say Y if you want to add support for SoC audio on Sharp
49 Zaurus SL-5600 model (Poodle).
50
51config SND_PXA2XX_SOC_TOSA
52 tristate "SoC AC97 Audio support for Tosa"
53 depends on SND_PXA2XX_SOC && MACH_TOSA
54 select SND_PXA2XX_SOC_AC97
55 select SND_SOC_WM9712
56 help
57 Say Y if you want to add support for SoC audio on Sharp
58 Zaurus SL-C6000x models (Tosa).
59
60endmenu
diff --git a/sound/soc/pxa/Makefile b/sound/soc/pxa/Makefile
new file mode 100644
index 000000000000..78e0d6b07d1d
--- /dev/null
+++ b/sound/soc/pxa/Makefile
@@ -0,0 +1,20 @@
1# PXA Platform Support
2snd-soc-pxa2xx-objs := pxa2xx-pcm.o
3snd-soc-pxa2xx-ac97-objs := pxa2xx-ac97.o
4snd-soc-pxa2xx-i2s-objs := pxa2xx-i2s.o
5
6obj-$(CONFIG_SND_PXA2XX_SOC) += snd-soc-pxa2xx.o
7obj-$(CONFIG_SND_PXA2XX_SOC_AC97) += snd-soc-pxa2xx-ac97.o
8obj-$(CONFIG_SND_PXA2XX_SOC_I2S) += snd-soc-pxa2xx-i2s.o
9
10# PXA Machine Support
11snd-soc-corgi-objs := corgi.o
12snd-soc-poodle-objs := poodle.o
13snd-soc-tosa-objs := tosa.o
14snd-soc-spitz-objs := spitz.o
15
16obj-$(CONFIG_SND_PXA2XX_SOC_CORGI) += snd-soc-corgi.o
17obj-$(CONFIG_SND_PXA2XX_SOC_POODLE) += snd-soc-poodle.o
18obj-$(CONFIG_SND_PXA2XX_SOC_TOSA) += snd-soc-tosa.o
19obj-$(CONFIG_SND_PXA2XX_SOC_SPITZ) += snd-soc-spitz.o
20