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
 menu "SoC Platforms"
 depends on SND_SOC
 source "sound/soc/at91/Kconfig"
+source "sound/soc/pxa/Kconfig"
 endmenu
 
 # 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 @@
 snd-soc-core-objs := soc-core.o soc-dapm.o
 
 obj-$(CONFIG_SND_SOC)   += snd-soc-core.o
-obj-$(CONFIG_SND_SOC)   += codecs/ at91/
+obj-$(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 @@
+menu "SoC Audio for the Intel PXA2xx"
+
+config SND_PXA2XX_SOC
+        tristate "SoC Audio for the Intel PXA2xx chip"
+        depends on ARCH_PXA && SND
+        select SND_PCM
+        help
+          Say Y or M if you want to add support for codecs attached to
+          the PXA2xx AC97, I2S or SSP interface. You will also need
+          to select the audio interfaces to support below.
+
+config SND_PXA2XX_AC97
+        tristate
+        select SND_AC97_CODEC
+
+config SND_PXA2XX_SOC_AC97
+        tristate
+        select SND_AC97_BUS
+        select SND_SOC_AC97_BUS
+
+config SND_PXA2XX_SOC_I2S
+        tristate
+
+config SND_PXA2XX_SOC_CORGI
+        tristate "SoC Audio support for Sharp Zaurus SL-C7x0"
+        depends on SND_PXA2XX_SOC && PXA_SHARP_C7xx
+        select SND_PXA2XX_SOC_I2S
+        select SND_SOC_WM8731
+        help
+          Say Y if you want to add support for SoC audio on Sharp
+          Zaurus SL-C7x0 models (Corgi, Shepherd, Husky).
+
+config SND_PXA2XX_SOC_SPITZ
+        tristate "SoC Audio support for Sharp Zaurus SL-Cxx00"
+        depends on SND_PXA2XX_SOC && PXA_SHARP_Cxx00
+        select SND_PXA2XX_SOC_I2S
+        select SND_SOC_WM8750
+        help
+          Say Y if you want to add support for SoC audio on Sharp
+          Zaurus SL-Cxx00 models (Spitz, Borzoi and Akita).
+
+config SND_PXA2XX_SOC_POODLE
+        tristate "SoC Audio support for Poodle"
+        depends on SND_PXA2XX_SOC && MACH_POODLE
+        select SND_PXA2XX_SOC_I2S
+        select SND_SOC_WM8731
+        help
+          Say Y if you want to add support for SoC audio on Sharp
+          Zaurus SL-5600 model (Poodle).
+
+config SND_PXA2XX_SOC_TOSA
+        tristate "SoC AC97 Audio support for Tosa"
+        depends on SND_PXA2XX_SOC && MACH_TOSA
+        select SND_PXA2XX_SOC_AC97
+        select SND_SOC_WM9712
+        help
+          Say Y if you want to add support for SoC audio on Sharp
+          Zaurus SL-C6000x models (Tosa).
+
+endmenu
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 @@
+# PXA Platform Support
+snd-soc-pxa2xx-objs := pxa2xx-pcm.o
+snd-soc-pxa2xx-ac97-objs := pxa2xx-ac97.o
+snd-soc-pxa2xx-i2s-objs := pxa2xx-i2s.o
+
+obj-$(CONFIG_SND_PXA2XX_SOC) += snd-soc-pxa2xx.o
+obj-$(CONFIG_SND_PXA2XX_SOC_AC97) += snd-soc-pxa2xx-ac97.o
+obj-$(CONFIG_SND_PXA2XX_SOC_I2S) += snd-soc-pxa2xx-i2s.o
+
+# PXA Machine Support
+snd-soc-corgi-objs := corgi.o
+snd-soc-poodle-objs := poodle.o
+snd-soc-tosa-objs := tosa.o
+snd-soc-spitz-objs := spitz.o
+
+obj-$(CONFIG_SND_PXA2XX_SOC_CORGI) += snd-soc-corgi.o
+obj-$(CONFIG_SND_PXA2XX_SOC_POODLE) += snd-soc-poodle.o
+obj-$(CONFIG_SND_PXA2XX_SOC_TOSA) += snd-soc-tosa.o
+obj-$(CONFIG_SND_PXA2XX_SOC_SPITZ) += snd-soc-spitz.o
+