1 files changed, 49 insertions, 49 deletions
diff --git a/sound/soc/s3c24xx/Kconfig b/sound/soc/s3c24xx/Kconfig
index 4989fad83563..eb45cf90d4e2 100644
--- a/sound/soc/s3c24xx/Kconfig
+++ b/sound/soc/s3c24xx/Kconfig
@@ -1,14 +1,14 @@
-config SND_S3C24XX_SOC
+config ASOC_SAMSUNG
-        tristate "SoC Audio for the Samsung S3CXXXX chips"
+        tristate "ASoC support for Samsung"
        depends on ARCH_S3C2410 || ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210
        select S3C64XX_DMA if ARCH_S3C64XX
        select S3C2410_DMA if ARCH_S3C2410
        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
+          the Samsung SoCs' Audio interfaces. You will also need to
          select the audio interfaces to support below.
-config SND_S3C24XX_SOC_I2S
+config SND_S3C24XX_I2S
        tristate
        select S3C2410_DMA
@@ -20,136 +20,136 @@ config SND_S3C2412_SOC_I2S
        select SND_S3C_I2SV2_SOC
        select S3C2410_DMA
-config SND_S3C_SOC_PCM
+config SND_SAMSUNG_PCM
        tristate
-config SND_S3C_SOC_AC97
+config SND_SAMSUNG_AC97
        tristate
        select SND_SOC_AC97_BUS
-config SND_S5P_SOC_SPDIF
+config SND_SAMSUNG_SPDIF
        tristate
        select SND_SOC_SPDIF
 config SND_SAMSUNG_I2S
        tristate
-config SND_S3C24XX_SOC_NEO1973_WM8753
+config ASOC_SAMSUNG_NEO1973_WM8753
        tristate "SoC I2S Audio support for NEO1973 - WM8753"
-        depends on SND_S3C24XX_SOC && MACH_NEO1973_GTA01
+        depends on ASOC_SAMSUNG && MACH_NEO1973_GTA01
-        select SND_S3C24XX_SOC_I2S
+        select SND_S3C24XX_I2S
        select SND_SOC_WM8753
        help
          Say Y if you want to add support for SoC audio on smdk2440
          with the WM8753.
-config SND_S3C24XX_SOC_NEO1973_GTA02_WM8753
+config ASOC_SAMSUNG_NEO1973_GTA02_WM8753
        tristate "Audio support for the Openmoko Neo FreeRunner (GTA02)"
-        depends on SND_S3C24XX_SOC && MACH_NEO1973_GTA02
+        depends on ASOC_SAMSUNG && MACH_NEO1973_GTA02
-        select SND_S3C24XX_SOC_I2S
+        select SND_S3C24XX_I2S
        select SND_SOC_WM8753
        help
          This driver provides audio support for the Openmoko Neo FreeRunner
          smartphone.
          
-config SND_S3C24XX_SOC_JIVE_WM8750
+config ASOC_SAMSUNG_JIVE_WM8750
        tristate "SoC I2S Audio support for Jive"
-        depends on SND_S3C24XX_SOC && MACH_JIVE
+        depends on ASOC_SAMSUNG && MACH_JIVE
        select SND_SOC_WM8750
        select SND_S3C2412_SOC_I2S
        help
          Sat Y if you want to add support for SoC audio on the Jive.
-config SND_SOC_SMDK_WM8580
+config ASOC_SAMSUNG_SMDK_WM8580
        tristate "SoC I2S Audio support for WM8580 on SMDK"
-        depends on SND_S3C24XX_SOC && (MACH_SMDK6410 || MACH_SMDKC100)
+        depends on ASOC_SAMSUNG && (MACH_SMDK6410 || MACH_SMDKC100)
        select SND_SOC_WM8580
        select SND_SAMSUNG_I2S
        help
          Say Y if you want to add support for SoC audio on the SMDKs.
-config SND_S3C24XX_SOC_SMDK2443_WM9710
+config ASOC_SAMSUNG_SMDK2443_WM9710
        tristate "SoC AC97 Audio support for SMDK2443 - WM9710"
-        depends on SND_S3C24XX_SOC && MACH_SMDK2443
+        depends on ASOC_SAMSUNG && MACH_SMDK2443
        select S3C2410_DMA
        select AC97_BUS
        select SND_SOC_AC97_CODEC
-        select SND_S3C_SOC_AC97
+        select SND_SAMSUNG_AC97
        help
          Say Y if you want to add support for SoC audio on smdk2443
          with the WM9710.
-config SND_S3C24XX_SOC_LN2440SBC_ALC650
+config ASOC_SAMSUNG_LN2440SBC_ALC650
        tristate "SoC AC97 Audio support for LN2440SBC - ALC650"
-        depends on SND_S3C24XX_SOC && ARCH_S3C2410
+        depends on ASOC_SAMSUNG && ARCH_S3C2410
        select S3C2410_DMA
        select AC97_BUS
        select SND_SOC_AC97_CODEC
-        select SND_S3C_SOC_AC97
+        select SND_SAMSUNG_AC97
        help
          Say Y if you want to add support for SoC audio on ln2440sbc
          with the ALC650.
-config SND_S3C24XX_SOC_S3C24XX_UDA134X
+config ASOC_SAMSUNG_S3C24XX_UDA134X
        tristate "SoC I2S Audio support UDA134X wired to a S3C24XX"
-        depends on SND_S3C24XX_SOC && ARCH_S3C2410
+        depends on ASOC_SAMSUNG && ARCH_S3C2410
-        select SND_S3C24XX_SOC_I2S
+        select SND_S3C24XX_I2S
        select SND_SOC_L3
-        select SND_SOC_UDA134X
+        select SND_SOC_UDA134X
-config SND_S3C24XX_SOC_SIMTEC
+config ASOC_SAMSUNG_SIMTEC
        tristate
        help
          Internal node for common S3C24XX/Simtec suppor
-config SND_S3C24XX_SOC_SIMTEC_TLV320AIC23
+config ASOC_SAMSUNG_SIMTEC_TLV320AIC23
        tristate "SoC I2S Audio support for TLV320AIC23 on Simtec boards"
-        depends on SND_S3C24XX_SOC && ARCH_S3C2410
+        depends on ASOC_SAMSUNG && ARCH_S3C2410
-        select SND_S3C24XX_SOC_I2S
+        select SND_S3C24XX_I2S
        select SND_SOC_TLV320AIC23
-        select SND_S3C24XX_SOC_SIMTEC
+        select ASOC_SAMSUNG_SIMTEC
-config SND_S3C24XX_SOC_SIMTEC_HERMES
+config ASOC_SAMSUNG_SIMTEC_HERMES
        tristate "SoC I2S Audio support for Simtec Hermes board"
-        depends on SND_S3C24XX_SOC && ARCH_S3C2410
+        depends on ASOC_SAMSUNG && ARCH_S3C2410
-        select SND_S3C24XX_SOC_I2S
+        select SND_S3C24XX_I2S
        select SND_SOC_TLV320AIC3X
-        select SND_S3C24XX_SOC_SIMTEC
+        select ASOC_SAMSUNG_SIMTEC
-config SND_S3C24XX_SOC_RX1950_UDA1380
+config ASOC_SAMSUNG_RX1950_UDA1380
        tristate "Audio support for the HP iPAQ RX1950"
-        depends on SND_S3C24XX_SOC && MACH_RX1950
+        depends on ASOC_SAMSUNG && MACH_RX1950
-        select SND_S3C24XX_SOC_I2S
+        select SND_S3C24XX_I2S
        select SND_SOC_UDA1380
        help
          This driver provides audio support for HP iPAQ RX1950 PDA.
-config SND_SOC_SMDK_WM9713
+config ASOC_SAMSUNG_SMDK_WM9713
        tristate "SoC AC97 Audio support for SMDK with WM9713"
-        depends on SND_S3C24XX_SOC && (MACH_SMDK6410 || MACH_SMDKC100 || MACH_SMDKV210 || MACH_SMDKC110)
+        depends on ASOC_SAMSUNG && (MACH_SMDK6410 || MACH_SMDKC100 || MACH_SMDKV210 || MACH_SMDKC110)
        select SND_SOC_WM9713
-        select SND_S3C_SOC_AC97
+        select SND_SAMSUNG_AC97
        help
          Sat Y if you want to add support for SoC audio on the SMDK.
-config SND_S3C64XX_SOC_SMARTQ
+config ASOC_SMARTQ
        tristate "SoC I2S Audio support for SmartQ board"
-        depends on SND_S3C24XX_SOC && MACH_SMARTQ
+        depends on ASOC_SAMSUNG && MACH_SMARTQ
        select SND_SAMSUNG_I2S
        select SND_SOC_WM8750
-config SND_SOC_GONI_AQUILA_WM8994
+config ASOC_GONI_AQUILA_WM8994
        tristate "SoC I2S Audio support for AQUILA/GONI - WM8994"
-        depends on SND_S3C24XX_SOC && (MACH_GONI || MACH_AQUILA)
+        depends on ASOC_SAMSUNG && (MACH_GONI || MACH_AQUILA)
        select SND_SAMSUNG_I2S
        select SND_SOC_WM8994
        help
          Say Y if you want to add support for SoC audio on goni or aquila
          with the WM8994.
-config SND_SOC_SMDK_SPDIF
+config ASOC_SAMSUNG_SMDK_SPDIF
        tristate "SoC S/PDIF Audio support for SMDK"
-        depends on SND_S3C24XX_SOC && (MACH_SMDKC100 || MACH_SMDKC110 || MACH_SMDKV210)
+        depends on ASOC_SAMSUNG && (MACH_SMDKC100 || MACH_SMDKC110 || MACH_SMDKV210)
-        select SND_S5P_SOC_SPDIF
+        select SND_SAMSUNG_SPDIF
        help
          Say Y if you want to add support for SoC S/PDIF audio on the SMDK.

diff --git a/sound/soc/s3c24xx/Kconfig b/sound/soc/s3c24xx/Kconfig index 4989fad83563..eb45cf90d4e2 100644 --- a/sound/soc/s3c24xx/Kconfig +++ b/sound/soc/s3c24xx/Kconfig
@@ -1,14 +1,14 @@
1	config SND_S3C24XX_SOC	1	config ASOC_SAMSUNG
2	tristate "SoC Audio for the Samsung S3CXXXX chips"	2	tristate "ASoC support for Samsung"
3	depends on ARCH_S3C2410 \|\| ARCH_S3C64XX \|\| ARCH_S5PC100 \|\| ARCH_S5PV210	3	depends on ARCH_S3C2410 \|\| ARCH_S3C64XX \|\| ARCH_S5PC100 \|\| ARCH_S5PV210
4	select S3C64XX_DMA if ARCH_S3C64XX	4	select S3C64XX_DMA if ARCH_S3C64XX
5	select S3C2410_DMA if ARCH_S3C2410	5	select S3C2410_DMA if ARCH_S3C2410
6	help	6	help
7	Say Y or M if you want to add support for codecs attached to	7	Say Y or M if you want to add support for codecs attached to
8	the S3C24XX AC97 or I2S interfaces. You will also need to	8	the Samsung SoCs' Audio interfaces. You will also need to
9	select the audio interfaces to support below.	9	select the audio interfaces to support below.
10		10
11	config SND_S3C24XX_SOC_I2S	11	config SND_S3C24XX_I2S
12	tristate	12	tristate
13	select S3C2410_DMA	13	select S3C2410_DMA
14		14
@@ -20,136 +20,136 @@ config SND_S3C2412_SOC_I2S
20	select SND_S3C_I2SV2_SOC	20	select SND_S3C_I2SV2_SOC
21	select S3C2410_DMA	21	select S3C2410_DMA
22		22
23	config SND_S3C_SOC_PCM	23	config SND_SAMSUNG_PCM
24	tristate	24	tristate
25		25
26	config SND_S3C_SOC_AC97	26	config SND_SAMSUNG_AC97
27	tristate	27	tristate
28	select SND_SOC_AC97_BUS	28	select SND_SOC_AC97_BUS
29		29
30	config SND_S5P_SOC_SPDIF	30	config SND_SAMSUNG_SPDIF
31	tristate	31	tristate
32	select SND_SOC_SPDIF	32	select SND_SOC_SPDIF
33		33
34	config SND_SAMSUNG_I2S	34	config SND_SAMSUNG_I2S
35	tristate	35	tristate
36		36
37	config SND_S3C24XX_SOC_NEO1973_WM8753	37	config ASOC_SAMSUNG_NEO1973_WM8753
38	tristate "SoC I2S Audio support for NEO1973 - WM8753"	38	tristate "SoC I2S Audio support for NEO1973 - WM8753"
39	depends on SND_S3C24XX_SOC && MACH_NEO1973_GTA01	39	depends on ASOC_SAMSUNG && MACH_NEO1973_GTA01
40	select SND_S3C24XX_SOC_I2S	40	select SND_S3C24XX_I2S
41	select SND_SOC_WM8753	41	select SND_SOC_WM8753
42	help	42	help
43	Say Y if you want to add support for SoC audio on smdk2440	43	Say Y if you want to add support for SoC audio on smdk2440
44	with the WM8753.	44	with the WM8753.
45		45
46	config SND_S3C24XX_SOC_NEO1973_GTA02_WM8753	46	config ASOC_SAMSUNG_NEO1973_GTA02_WM8753
47	tristate "Audio support for the Openmoko Neo FreeRunner (GTA02)"	47	tristate "Audio support for the Openmoko Neo FreeRunner (GTA02)"
48	depends on SND_S3C24XX_SOC && MACH_NEO1973_GTA02	48	depends on ASOC_SAMSUNG && MACH_NEO1973_GTA02
49	select SND_S3C24XX_SOC_I2S	49	select SND_S3C24XX_I2S
50	select SND_SOC_WM8753	50	select SND_SOC_WM8753
51	help	51	help
52	This driver provides audio support for the Openmoko Neo FreeRunner	52	This driver provides audio support for the Openmoko Neo FreeRunner
53	smartphone.	53	smartphone.
54		54
55	config SND_S3C24XX_SOC_JIVE_WM8750	55	config ASOC_SAMSUNG_JIVE_WM8750
56	tristate "SoC I2S Audio support for Jive"	56	tristate "SoC I2S Audio support for Jive"
57	depends on SND_S3C24XX_SOC && MACH_JIVE	57	depends on ASOC_SAMSUNG && MACH_JIVE
58	select SND_SOC_WM8750	58	select SND_SOC_WM8750
59	select SND_S3C2412_SOC_I2S	59	select SND_S3C2412_SOC_I2S
60	help	60	help
61	Sat Y if you want to add support for SoC audio on the Jive.	61	Sat Y if you want to add support for SoC audio on the Jive.
62		62
63	config SND_SOC_SMDK_WM8580	63	config ASOC_SAMSUNG_SMDK_WM8580
64	tristate "SoC I2S Audio support for WM8580 on SMDK"	64	tristate "SoC I2S Audio support for WM8580 on SMDK"
65	depends on SND_S3C24XX_SOC && (MACH_SMDK6410 \|\| MACH_SMDKC100)	65	depends on ASOC_SAMSUNG && (MACH_SMDK6410 \|\| MACH_SMDKC100)
66	select SND_SOC_WM8580	66	select SND_SOC_WM8580
67	select SND_SAMSUNG_I2S	67	select SND_SAMSUNG_I2S
68	help	68	help
69	Say Y if you want to add support for SoC audio on the SMDKs.	69	Say Y if you want to add support for SoC audio on the SMDKs.
70		70
71	config SND_S3C24XX_SOC_SMDK2443_WM9710	71	config ASOC_SAMSUNG_SMDK2443_WM9710
72	tristate "SoC AC97 Audio support for SMDK2443 - WM9710"	72	tristate "SoC AC97 Audio support for SMDK2443 - WM9710"
73	depends on SND_S3C24XX_SOC && MACH_SMDK2443	73	depends on ASOC_SAMSUNG && MACH_SMDK2443
74	select S3C2410_DMA	74	select S3C2410_DMA
75	select AC97_BUS	75	select AC97_BUS
76	select SND_SOC_AC97_CODEC	76	select SND_SOC_AC97_CODEC
77	select SND_S3C_SOC_AC97	77	select SND_SAMSUNG_AC97
78	help	78	help
79	Say Y if you want to add support for SoC audio on smdk2443	79	Say Y if you want to add support for SoC audio on smdk2443
80	with the WM9710.	80	with the WM9710.
81		81
82	config SND_S3C24XX_SOC_LN2440SBC_ALC650	82	config ASOC_SAMSUNG_LN2440SBC_ALC650
83	tristate "SoC AC97 Audio support for LN2440SBC - ALC650"	83	tristate "SoC AC97 Audio support for LN2440SBC - ALC650"
84	depends on SND_S3C24XX_SOC && ARCH_S3C2410	84	depends on ASOC_SAMSUNG && ARCH_S3C2410
85	select S3C2410_DMA	85	select S3C2410_DMA
86	select AC97_BUS	86	select AC97_BUS
87	select SND_SOC_AC97_CODEC	87	select SND_SOC_AC97_CODEC
88	select SND_S3C_SOC_AC97	88	select SND_SAMSUNG_AC97
89	help	89	help
90	Say Y if you want to add support for SoC audio on ln2440sbc	90	Say Y if you want to add support for SoC audio on ln2440sbc
91	with the ALC650.	91	with the ALC650.
92		92
93	config SND_S3C24XX_SOC_S3C24XX_UDA134X	93	config ASOC_SAMSUNG_S3C24XX_UDA134X
94	tristate "SoC I2S Audio support UDA134X wired to a S3C24XX"	94	tristate "SoC I2S Audio support UDA134X wired to a S3C24XX"
95	depends on SND_S3C24XX_SOC && ARCH_S3C2410	95	depends on ASOC_SAMSUNG && ARCH_S3C2410
96	select SND_S3C24XX_SOC_I2S	96	select SND_S3C24XX_I2S
97	select SND_SOC_L3	97	select SND_SOC_L3
98	select SND_SOC_UDA134X	98	select SND_SOC_UDA134X
99		99
100	config SND_S3C24XX_SOC_SIMTEC	100	config ASOC_SAMSUNG_SIMTEC
101	tristate	101	tristate
102	help	102	help
103	Internal node for common S3C24XX/Simtec suppor	103	Internal node for common S3C24XX/Simtec suppor
104		104
105	config SND_S3C24XX_SOC_SIMTEC_TLV320AIC23	105	config ASOC_SAMSUNG_SIMTEC_TLV320AIC23
106	tristate "SoC I2S Audio support for TLV320AIC23 on Simtec boards"	106	tristate "SoC I2S Audio support for TLV320AIC23 on Simtec boards"
107	depends on SND_S3C24XX_SOC && ARCH_S3C2410	107	depends on ASOC_SAMSUNG && ARCH_S3C2410
108	select SND_S3C24XX_SOC_I2S	108	select SND_S3C24XX_I2S
109	select SND_SOC_TLV320AIC23	109	select SND_SOC_TLV320AIC23
110	select SND_S3C24XX_SOC_SIMTEC	110	select ASOC_SAMSUNG_SIMTEC
111		111
112	config SND_S3C24XX_SOC_SIMTEC_HERMES	112	config ASOC_SAMSUNG_SIMTEC_HERMES
113	tristate "SoC I2S Audio support for Simtec Hermes board"	113	tristate "SoC I2S Audio support for Simtec Hermes board"
114	depends on SND_S3C24XX_SOC && ARCH_S3C2410	114	depends on ASOC_SAMSUNG && ARCH_S3C2410
115	select SND_S3C24XX_SOC_I2S	115	select SND_S3C24XX_I2S
116	select SND_SOC_TLV320AIC3X	116	select SND_SOC_TLV320AIC3X
117	select SND_S3C24XX_SOC_SIMTEC	117	select ASOC_SAMSUNG_SIMTEC
118		118
119	config SND_S3C24XX_SOC_RX1950_UDA1380	119	config ASOC_SAMSUNG_RX1950_UDA1380
120	tristate "Audio support for the HP iPAQ RX1950"	120	tristate "Audio support for the HP iPAQ RX1950"
121	depends on SND_S3C24XX_SOC && MACH_RX1950	121	depends on ASOC_SAMSUNG && MACH_RX1950
122	select SND_S3C24XX_SOC_I2S	122	select SND_S3C24XX_I2S
123	select SND_SOC_UDA1380	123	select SND_SOC_UDA1380
124	help	124	help
125	This driver provides audio support for HP iPAQ RX1950 PDA.	125	This driver provides audio support for HP iPAQ RX1950 PDA.
126		126
127	config SND_SOC_SMDK_WM9713	127	config ASOC_SAMSUNG_SMDK_WM9713
128	tristate "SoC AC97 Audio support for SMDK with WM9713"	128	tristate "SoC AC97 Audio support for SMDK with WM9713"
129	depends on SND_S3C24XX_SOC && (MACH_SMDK6410 \|\| MACH_SMDKC100 \|\| MACH_SMDKV210 \|\| MACH_SMDKC110)	129	depends on ASOC_SAMSUNG && (MACH_SMDK6410 \|\| MACH_SMDKC100 \|\| MACH_SMDKV210 \|\| MACH_SMDKC110)
130	select SND_SOC_WM9713	130	select SND_SOC_WM9713
131	select SND_S3C_SOC_AC97	131	select SND_SAMSUNG_AC97
132	help	132	help
133	Sat Y if you want to add support for SoC audio on the SMDK.	133	Sat Y if you want to add support for SoC audio on the SMDK.
134		134
135	config SND_S3C64XX_SOC_SMARTQ	135	config ASOC_SMARTQ
136	tristate "SoC I2S Audio support for SmartQ board"	136	tristate "SoC I2S Audio support for SmartQ board"
137	depends on SND_S3C24XX_SOC && MACH_SMARTQ	137	depends on ASOC_SAMSUNG && MACH_SMARTQ
138	select SND_SAMSUNG_I2S	138	select SND_SAMSUNG_I2S
139	select SND_SOC_WM8750	139	select SND_SOC_WM8750
140		140
141	config SND_SOC_GONI_AQUILA_WM8994	141	config ASOC_GONI_AQUILA_WM8994
142	tristate "SoC I2S Audio support for AQUILA/GONI - WM8994"	142	tristate "SoC I2S Audio support for AQUILA/GONI - WM8994"
143	depends on SND_S3C24XX_SOC && (MACH_GONI \|\| MACH_AQUILA)	143	depends on ASOC_SAMSUNG && (MACH_GONI \|\| MACH_AQUILA)
144	select SND_SAMSUNG_I2S	144	select SND_SAMSUNG_I2S
145	select SND_SOC_WM8994	145	select SND_SOC_WM8994
146	help	146	help
147	Say Y if you want to add support for SoC audio on goni or aquila	147	Say Y if you want to add support for SoC audio on goni or aquila
148	with the WM8994.	148	with the WM8994.
149		149
150	config SND_SOC_SMDK_SPDIF	150	config ASOC_SAMSUNG_SMDK_SPDIF
151	tristate "SoC S/PDIF Audio support for SMDK"	151	tristate "SoC S/PDIF Audio support for SMDK"
152	depends on SND_S3C24XX_SOC && (MACH_SMDKC100 \|\| MACH_SMDKC110 \|\| MACH_SMDKV210)	152	depends on ASOC_SAMSUNG && (MACH_SMDKC100 \|\| MACH_SMDKC110 \|\| MACH_SMDKV210)
153	select SND_S5P_SOC_SPDIF	153	select SND_SAMSUNG_SPDIF
154	help	154	help
155	Say Y if you want to add support for SoC S/PDIF audio on the SMDK.	155	Say Y if you want to add support for SoC S/PDIF audio on the SMDK.