From f392c260930eea1ff2fc7b58835b7038d853e48c Mon Sep 17 00:00:00 2001
From: Frank Mandarino <fmandarino@endrelia.com>
Date: Fri, 6 Oct 2006 18:41:42 +0200
Subject: [PATCH] --- yaml --- r: 47056 b: refs/heads/master c:
 8dafc0fb49b903c4e7262b2622bef8342345c700 h: refs/heads/master v: v3

---
 [refs]                        |  2 +-
 trunk/sound/soc/Kconfig       |  6 ++++++
 trunk/sound/soc/Makefile      |  2 +-
 trunk/sound/soc/at91/Kconfig  | 24 ++++++++++++++++++++++++
 trunk/sound/soc/at91/Makefile | 11 +++++++++++
 5 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 trunk/sound/soc/at91/Kconfig
 create mode 100644 trunk/sound/soc/at91/Makefile

diff --git a/[refs] b/[refs]
index 983f60909cb9..3056c2b9ae04 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b41bf38a4323a32ec4890c74818c4a3d2661fe6c
+refs/heads/master: 8dafc0fb49b903c4e7262b2622bef8342345c700
diff --git a/trunk/sound/soc/Kconfig b/trunk/sound/soc/Kconfig
index 288bad30b213..e7dab5bdc6b2 100644
--- a/trunk/sound/soc/Kconfig
+++ b/trunk/sound/soc/Kconfig
@@ -19,6 +19,12 @@ config SND_SOC
 	  This SoC audio support can also be built as a module.  If so, the module
 	  will be called snd-soc-core.
 
+# All the supported Soc's
+menu "SoC Platforms"
+depends on SND_SOC
+source "sound/soc/at91/Kconfig"
+endmenu
+
 # Supported codecs
 source "sound/soc/codecs/Kconfig"
 
diff --git a/trunk/sound/soc/Makefile b/trunk/sound/soc/Makefile
index 3dd4f20c5ecf..3e12a1654c49 100644
--- a/trunk/sound/soc/Makefile
+++ b/trunk/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/
+obj-$(CONFIG_SND_SOC)	+= codecs/ at91/
diff --git a/trunk/sound/soc/at91/Kconfig b/trunk/sound/soc/at91/Kconfig
new file mode 100644
index 000000000000..d38ba9203bd9
--- /dev/null
+++ b/trunk/sound/soc/at91/Kconfig
@@ -0,0 +1,24 @@
+menu "SoC Audio for the Atmel AT91"
+
+config SND_AT91_SOC
+	tristate "SoC Audio for the Atmel AT91 System-on-Chip"
+	depends on ARCH_AT91 && SND
+	select SND_PCM
+	help
+	  Say Y or M if you want to add support for codecs attached to
+	  the AT91 SSC interface. You will also need
+	  to select the audio interfaces to support below.
+
+config SND_AT91_SOC_I2S
+	tristate
+
+config SND_AT91_SOC_ETI_B1_WM8731
+	tristate "SoC I2S Audio support for Endrelia ETI-B1 board"
+	depends on SND_AT91_SOC && MACH_ETI_B1
+	select SND_AT91_SOC_I2S
+	select SND_SOC_WM8731
+	help
+	  Say Y if you want to add support for SoC audio on Endrelia
+          ETI-B1 board.
+
+endmenu
diff --git a/trunk/sound/soc/at91/Makefile b/trunk/sound/soc/at91/Makefile
new file mode 100644
index 000000000000..eb12ea2d1944
--- /dev/null
+++ b/trunk/sound/soc/at91/Makefile
@@ -0,0 +1,11 @@
+# AT91 Platform Support
+snd-soc-at91-objs := at91rm9200-pcm.o
+snd-soc-at91-i2s-objs := at91rm9200-i2s.o
+
+obj-$(CONFIG_SND_AT91_SOC) += snd-soc-at91.o
+obj-$(CONFIG_SND_AT91_SOC_I2S) += snd-soc-at91-i2s.o
+
+# AT91 Machine Support
+snd-soc-eti-b1-wm8731-objs := eti_b1_wm8731.o
+
+obj-$(CONFIG_SND_AT91_SOC_ETI_B1_WM8731) += snd-soc-eti-b1-wm8731.o