1 files changed, 32 insertions, 3 deletions
diff --git a/sound/soc/s3c24xx/Kconfig b/sound/soc/s3c24xx/Kconfig
index df494d1e346f..923428fc1adb 100644
--- a/sound/soc/s3c24xx/Kconfig
+++ b/sound/soc/s3c24xx/Kconfig
@@ -1,6 +1,7 @@
 config SND_S3C24XX_SOC
        tristate "SoC Audio for the Samsung S3CXXXX chips"
-        depends on ARCH_S3C2410
+        depends on ARCH_S3C2410 || ARCH_S3C64XX
+        select S3C64XX_DMA if ARCH_S3C64XX
        help
          Say Y or M if you want to add support for codecs attached to
          the S3C24XX AC97 or I2S interfaces. You will also need to
@@ -38,6 +39,15 @@ config SND_S3C24XX_SOC_NEO1973_WM8753
          Say Y if you want to add support for SoC audio on smdk2440
          with the WM8753.
+config SND_S3C24XX_SOC_NEO1973_GTA02_WM8753
+        tristate "Audio support for the Openmoko Neo FreeRunner (GTA02)"
+        depends on SND_S3C24XX_SOC && MACH_NEO1973_GTA02
+        select SND_S3C24XX_SOC_I2S
+        select SND_SOC_WM8753
+        help
+          This driver provides audio support for the Openmoko Neo FreeRunner
+          smartphone.
+          
 config SND_S3C24XX_SOC_JIVE_WM8750
        tristate "SoC I2S Audio support for Jive"
        depends on SND_S3C24XX_SOC && MACH_JIVE
@@ -57,7 +67,7 @@ config SND_S3C24XX_SOC_SMDK2443_WM9710
 config SND_S3C24XX_SOC_LN2440SBC_ALC650
        tristate "SoC AC97 Audio support for LN2440SBC - ALC650"
-        depends on SND_S3C24XX_SOC
+        depends on SND_S3C24XX_SOC && ARCH_S3C2410
        select SND_S3C2443_SOC_AC97
        select SND_SOC_AC97_CODEC
        help
@@ -66,7 +76,26 @@ config SND_S3C24XX_SOC_LN2440SBC_ALC650
 config SND_S3C24XX_SOC_S3C24XX_UDA134X
        tristate "SoC I2S Audio support UDA134X wired to a S3C24XX"
-        depends on SND_S3C24XX_SOC
+        depends on SND_S3C24XX_SOC && ARCH_S3C2410
        select SND_S3C24XX_SOC_I2S
        select SND_SOC_L3
        select SND_SOC_UDA134X
+config SND_S3C24XX_SOC_SIMTEC
+        tristate
+        help
+          Internal node for common S3C24XX/Simtec suppor
+config SND_S3C24XX_SOC_SIMTEC_TLV320AIC23
+        tristate "SoC I2S Audio support for TLV320AIC23 on Simtec boards"
+        depends on SND_S3C24XX_SOC && ARCH_S3C2410
+        select SND_S3C24XX_SOC_I2S
+        select SND_SOC_TLV320AIC23
+        select SND_S3C24XX_SOC_SIMTEC
+config SND_S3C24XX_SOC_SIMTEC_HERMES
+        tristate "SoC I2S Audio support for Simtec Hermes board"
+        depends on SND_S3C24XX_SOC && ARCH_S3C2410
+        select SND_S3C24XX_SOC_I2S
+        select SND_SOC_TLV320AIC3X
+        select SND_S3C24XX_SOC_SIMTEC

diff --git a/sound/soc/s3c24xx/Kconfig b/sound/soc/s3c24xx/Kconfig index df494d1e346f..923428fc1adb 100644 --- a/sound/soc/s3c24xx/Kconfig +++ b/sound/soc/s3c24xx/Kconfig
@@ -1,6 +1,7 @@
1	config SND_S3C24XX_SOC	1	config SND_S3C24XX_SOC
2	tristate "SoC Audio for the Samsung S3CXXXX chips"	2	tristate "SoC Audio for the Samsung S3CXXXX chips"
3	depends on ARCH_S3C2410	3	depends on ARCH_S3C2410 \|\| ARCH_S3C64XX
		4	select S3C64XX_DMA if ARCH_S3C64XX
4	help	5	help
5	Say Y or M if you want to add support for codecs attached to	6	Say Y or M if you want to add support for codecs attached to
6	the S3C24XX AC97 or I2S interfaces. You will also need to	7	the S3C24XX AC97 or I2S interfaces. You will also need to
@@ -38,6 +39,15 @@ config SND_S3C24XX_SOC_NEO1973_WM8753
38	Say Y if you want to add support for SoC audio on smdk2440	39	Say Y if you want to add support for SoC audio on smdk2440
39	with the WM8753.	40	with the WM8753.
40		41
		42	config SND_S3C24XX_SOC_NEO1973_GTA02_WM8753
		43	tristate "Audio support for the Openmoko Neo FreeRunner (GTA02)"
		44	depends on SND_S3C24XX_SOC && MACH_NEO1973_GTA02
		45	select SND_S3C24XX_SOC_I2S
		46	select SND_SOC_WM8753
		47	help
		48	This driver provides audio support for the Openmoko Neo FreeRunner
		49	smartphone.
		50
41	config SND_S3C24XX_SOC_JIVE_WM8750	51	config SND_S3C24XX_SOC_JIVE_WM8750
42	tristate "SoC I2S Audio support for Jive"	52	tristate "SoC I2S Audio support for Jive"
43	depends on SND_S3C24XX_SOC && MACH_JIVE	53	depends on SND_S3C24XX_SOC && MACH_JIVE
@@ -57,7 +67,7 @@ config SND_S3C24XX_SOC_SMDK2443_WM9710
57		67
58	config SND_S3C24XX_SOC_LN2440SBC_ALC650	68	config SND_S3C24XX_SOC_LN2440SBC_ALC650
59	tristate "SoC AC97 Audio support for LN2440SBC - ALC650"	69	tristate "SoC AC97 Audio support for LN2440SBC - ALC650"
60	depends on SND_S3C24XX_SOC	70	depends on SND_S3C24XX_SOC && ARCH_S3C2410
61	select SND_S3C2443_SOC_AC97	71	select SND_S3C2443_SOC_AC97
62	select SND_SOC_AC97_CODEC	72	select SND_SOC_AC97_CODEC
63	help	73	help
@@ -66,7 +76,26 @@ config SND_S3C24XX_SOC_LN2440SBC_ALC650
66		76
67	config SND_S3C24XX_SOC_S3C24XX_UDA134X	77	config SND_S3C24XX_SOC_S3C24XX_UDA134X
68	tristate "SoC I2S Audio support UDA134X wired to a S3C24XX"	78	tristate "SoC I2S Audio support UDA134X wired to a S3C24XX"
69	depends on SND_S3C24XX_SOC	79	depends on SND_S3C24XX_SOC && ARCH_S3C2410
70	select SND_S3C24XX_SOC_I2S	80	select SND_S3C24XX_SOC_I2S
71	select SND_SOC_L3	81	select SND_SOC_L3
72	select SND_SOC_UDA134X	82	select SND_SOC_UDA134X
		83
		84	config SND_S3C24XX_SOC_SIMTEC
		85	tristate
		86	help
		87	Internal node for common S3C24XX/Simtec suppor
		88
		89	config SND_S3C24XX_SOC_SIMTEC_TLV320AIC23
		90	tristate "SoC I2S Audio support for TLV320AIC23 on Simtec boards"
		91	depends on SND_S3C24XX_SOC && ARCH_S3C2410
		92	select SND_S3C24XX_SOC_I2S
		93	select SND_SOC_TLV320AIC23
		94	select SND_S3C24XX_SOC_SIMTEC
		95
		96	config SND_S3C24XX_SOC_SIMTEC_HERMES
		97	tristate "SoC I2S Audio support for Simtec Hermes board"
		98	depends on SND_S3C24XX_SOC && ARCH_S3C2410
		99	select SND_S3C24XX_SOC_I2S
		100	select SND_SOC_TLV320AIC3X
		101	select SND_S3C24XX_SOC_SIMTEC