aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sound/soc/samsung/Kconfig72
-rw-r--r--sound/soc/samsung/Makefile36
2 files changed, 54 insertions, 54 deletions
diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig
index 11ff4adf9901..a6a6b5fa2f2f 100644
--- a/sound/soc/samsung/Kconfig
+++ b/sound/soc/samsung/Kconfig
@@ -1,4 +1,4 @@
1config ASOC_SAMSUNG 1config SND_SOC_SAMSUNG
2 tristate "ASoC support for Samsung" 2 tristate "ASoC support for Samsung"
3 depends on ARCH_S3C2410 || ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_S5P64X0 || ARCH_S5P6442 || ARCH_S5PV310 3 depends on ARCH_S3C2410 || ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_S5P64X0 || ARCH_S5P6442 || ARCH_S5PV310
4 select S3C64XX_DMA if ARCH_S3C64XX 4 select S3C64XX_DMA if ARCH_S3C64XX
@@ -34,51 +34,51 @@ config SND_SAMSUNG_SPDIF
34config SND_SAMSUNG_I2S 34config SND_SAMSUNG_I2S
35 tristate 35 tristate
36 36
37config ASOC_SAMSUNG_NEO1973_WM8753 37config SND_SOC_SAMSUNG_NEO1973_WM8753
38 tristate "SoC I2S Audio support for NEO1973 - WM8753" 38 tristate "SoC I2S Audio support for NEO1973 - WM8753"
39 depends on ASOC_SAMSUNG && MACH_NEO1973_GTA01 39 depends on SND_SOC_SAMSUNG && MACH_NEO1973_GTA01
40 select SND_S3C24XX_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
46config ASOC_SAMSUNG_NEO1973_GTA02_WM8753 46config SND_SOC_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 ASOC_SAMSUNG && MACH_NEO1973_GTA02 48 depends on SND_SOC_SAMSUNG && MACH_NEO1973_GTA02
49 select SND_S3C24XX_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
55config ASOC_SAMSUNG_JIVE_WM8750 55config SND_SOC_SAMSUNG_JIVE_WM8750
56 tristate "SoC I2S Audio support for Jive" 56 tristate "SoC I2S Audio support for Jive"
57 depends on ASOC_SAMSUNG && MACH_JIVE 57 depends on SND_SOC_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
63config ASOC_SAMSUNG_SMDK_WM8580 63config SND_SOC_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 ASOC_SAMSUNG && (MACH_SMDK6410 || MACH_SMDKC100 || MACH_SMDK6440 || MACH_SMDK6450 || MACH_SMDK6442 || MACH_SMDKV210 || MACH_SMDKC110) 65 depends on SND_SOC_SAMSUNG && (MACH_SMDK6410 || MACH_SMDKC100 || MACH_SMDK6440 || MACH_SMDK6450 || MACH_SMDK6442 || MACH_SMDKV210 || MACH_SMDKC110)
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
71config ASOC_SAMSUNG_SMDK_WM8994 71config SND_SOC_SAMSUNG_SMDK_WM8994
72 tristate "SoC I2S Audio support for WM8994 on SMDK" 72 tristate "SoC I2S Audio support for WM8994 on SMDK"
73 depends on ASOC_SAMSUNG && (MACH_SMDKV310 || MACH_SMDKC210) 73 depends on SND_SOC_SAMSUNG && (MACH_SMDKV310 || MACH_SMDKC210)
74 select SND_SOC_WM8994 74 select SND_SOC_WM8994
75 select SND_SAMSUNG_I2S 75 select SND_SAMSUNG_I2S
76 help 76 help
77 Say Y if you want to add support for SoC audio on the SMDKs. 77 Say Y if you want to add support for SoC audio on the SMDKs.
78 78
79config ASOC_SAMSUNG_SMDK2443_WM9710 79config SND_SOC_SAMSUNG_SMDK2443_WM9710
80 tristate "SoC AC97 Audio support for SMDK2443 - WM9710" 80 tristate "SoC AC97 Audio support for SMDK2443 - WM9710"
81 depends on ASOC_SAMSUNG && MACH_SMDK2443 81 depends on SND_SOC_SAMSUNG && MACH_SMDK2443
82 select S3C2410_DMA 82 select S3C2410_DMA
83 select AC97_BUS 83 select AC97_BUS
84 select SND_SOC_AC97_CODEC 84 select SND_SOC_AC97_CODEC
@@ -87,9 +87,9 @@ config ASOC_SAMSUNG_SMDK2443_WM9710
87 Say Y if you want to add support for SoC audio on smdk2443 87 Say Y if you want to add support for SoC audio on smdk2443
88 with the WM9710. 88 with the WM9710.
89 89
90config ASOC_SAMSUNG_LN2440SBC_ALC650 90config SND_SOC_SAMSUNG_LN2440SBC_ALC650
91 tristate "SoC AC97 Audio support for LN2440SBC - ALC650" 91 tristate "SoC AC97 Audio support for LN2440SBC - ALC650"
92 depends on ASOC_SAMSUNG && ARCH_S3C2410 92 depends on SND_SOC_SAMSUNG && ARCH_S3C2410
93 select S3C2410_DMA 93 select S3C2410_DMA
94 select AC97_BUS 94 select AC97_BUS
95 select SND_SOC_AC97_CODEC 95 select SND_SOC_AC97_CODEC
@@ -98,74 +98,74 @@ config ASOC_SAMSUNG_LN2440SBC_ALC650
98 Say Y if you want to add support for SoC audio on ln2440sbc 98 Say Y if you want to add support for SoC audio on ln2440sbc
99 with the ALC650. 99 with the ALC650.
100 100
101config ASOC_SAMSUNG_S3C24XX_UDA134X 101config SND_SOC_SAMSUNG_S3C24XX_UDA134X
102 tristate "SoC I2S Audio support UDA134X wired to a S3C24XX" 102 tristate "SoC I2S Audio support UDA134X wired to a S3C24XX"
103 depends on ASOC_SAMSUNG && ARCH_S3C2410 103 depends on SND_SOC_SAMSUNG && ARCH_S3C2410
104 select SND_S3C24XX_I2S 104 select SND_S3C24XX_I2S
105 select SND_SOC_L3 105 select SND_SOC_L3
106 select SND_SOC_UDA134X 106 select SND_SOC_UDA134X
107 107
108config ASOC_SAMSUNG_SIMTEC 108config SND_SOC_SAMSUNG_SIMTEC
109 tristate 109 tristate
110 help 110 help
111 Internal node for common S3C24XX/Simtec suppor 111 Internal node for common S3C24XX/Simtec suppor
112 112
113config ASOC_SAMSUNG_SIMTEC_TLV320AIC23 113config SND_SOC_SAMSUNG_SIMTEC_TLV320AIC23
114 tristate "SoC I2S Audio support for TLV320AIC23 on Simtec boards" 114 tristate "SoC I2S Audio support for TLV320AIC23 on Simtec boards"
115 depends on ASOC_SAMSUNG && ARCH_S3C2410 115 depends on SND_SOC_SAMSUNG && ARCH_S3C2410
116 select SND_S3C24XX_I2S 116 select SND_S3C24XX_I2S
117 select SND_SOC_TLV320AIC23 117 select SND_SOC_TLV320AIC23
118 select ASOC_SAMSUNG_SIMTEC 118 select SND_SOC_SAMSUNG_SIMTEC
119 119
120config ASOC_SAMSUNG_SIMTEC_HERMES 120config SND_SOC_SAMSUNG_SIMTEC_HERMES
121 tristate "SoC I2S Audio support for Simtec Hermes board" 121 tristate "SoC I2S Audio support for Simtec Hermes board"
122 depends on ASOC_SAMSUNG && ARCH_S3C2410 122 depends on SND_SOC_SAMSUNG && ARCH_S3C2410
123 select SND_S3C24XX_I2S 123 select SND_S3C24XX_I2S
124 select SND_SOC_TLV320AIC3X 124 select SND_SOC_TLV320AIC3X
125 select ASOC_SAMSUNG_SIMTEC 125 select SND_SOC_SAMSUNG_SIMTEC
126 126
127config ASOC_SAMSUNG_H1940_UDA1380 127config SND_SOC_SAMSUNG_H1940_UDA1380
128 tristate "Audio support for the HP iPAQ H1940" 128 tristate "Audio support for the HP iPAQ H1940"
129 depends on ASOC_SAMSUNG && ARCH_H1940 129 depends on SND_SOC_SAMSUNG && ARCH_H1940
130 select SND_S3C24XX_I2S 130 select SND_S3C24XX_I2S
131 select SND_SOC_UDA1380 131 select SND_SOC_UDA1380
132 help 132 help
133 This driver provides audio support for HP iPAQ h1940 PDA. 133 This driver provides audio support for HP iPAQ h1940 PDA.
134 134
135config ASOC_SAMSUNG_RX1950_UDA1380 135config SND_SOC_SAMSUNG_RX1950_UDA1380
136 tristate "Audio support for the HP iPAQ RX1950" 136 tristate "Audio support for the HP iPAQ RX1950"
137 depends on ASOC_SAMSUNG && MACH_RX1950 137 depends on SND_SOC_SAMSUNG && MACH_RX1950
138 select SND_S3C24XX_I2S 138 select SND_S3C24XX_I2S
139 select SND_SOC_UDA1380 139 select SND_SOC_UDA1380
140 help 140 help
141 This driver provides audio support for HP iPAQ RX1950 PDA. 141 This driver provides audio support for HP iPAQ RX1950 PDA.
142 142
143config ASOC_SAMSUNG_SMDK_WM9713 143config SND_SOC_SAMSUNG_SMDK_WM9713
144 tristate "SoC AC97 Audio support for SMDK with WM9713" 144 tristate "SoC AC97 Audio support for SMDK with WM9713"
145 depends on ASOC_SAMSUNG && (MACH_SMDK6410 || MACH_SMDKC100 || MACH_SMDKV210 || MACH_SMDKC110 || MACH_SMDKV310 || MACH_SMDKC210) 145 depends on SND_SOC_SAMSUNG && (MACH_SMDK6410 || MACH_SMDKC100 || MACH_SMDKV210 || MACH_SMDKC110 || MACH_SMDKV310 || MACH_SMDKC210)
146 select SND_SOC_WM9713 146 select SND_SOC_WM9713
147 select SND_SAMSUNG_AC97 147 select SND_SAMSUNG_AC97
148 help 148 help
149 Sat Y if you want to add support for SoC audio on the SMDK. 149 Sat Y if you want to add support for SoC audio on the SMDK.
150 150
151config ASOC_SMARTQ 151config SND_SOC_SMARTQ
152 tristate "SoC I2S Audio support for SmartQ board" 152 tristate "SoC I2S Audio support for SmartQ board"
153 depends on ASOC_SAMSUNG && MACH_SMARTQ 153 depends on SND_SOC_SAMSUNG && MACH_SMARTQ
154 select SND_SAMSUNG_I2S 154 select SND_SAMSUNG_I2S
155 select SND_SOC_WM8750 155 select SND_SOC_WM8750
156 156
157config ASOC_GONI_AQUILA_WM8994 157config SND_SOC_GONI_AQUILA_WM8994
158 tristate "SoC I2S Audio support for AQUILA/GONI - WM8994" 158 tristate "SoC I2S Audio support for AQUILA/GONI - WM8994"
159 depends on ASOC_SAMSUNG && (MACH_GONI || MACH_AQUILA) 159 depends on SND_SOC_SAMSUNG && (MACH_GONI || MACH_AQUILA)
160 select SND_SAMSUNG_I2S 160 select SND_SAMSUNG_I2S
161 select SND_SOC_WM8994 161 select SND_SOC_WM8994
162 help 162 help
163 Say Y if you want to add support for SoC audio on goni or aquila 163 Say Y if you want to add support for SoC audio on goni or aquila
164 with the WM8994. 164 with the WM8994.
165 165
166config ASOC_SAMSUNG_SMDK_SPDIF 166config SND_SOC_SAMSUNG_SMDK_SPDIF
167 tristate "SoC S/PDIF Audio support for SMDK" 167 tristate "SoC S/PDIF Audio support for SMDK"
168 depends on ASOC_SAMSUNG && (MACH_SMDKC100 || MACH_SMDKC110 || MACH_SMDKV210) 168 depends on SND_SOC_SAMSUNG && (MACH_SMDKC100 || MACH_SMDKC110 || MACH_SMDKV210)
169 select SND_SAMSUNG_SPDIF 169 select SND_SAMSUNG_SPDIF
170 help 170 help
171 Say Y if you want to add support for SoC S/PDIF audio on the SMDK. 171 Say Y if you want to add support for SoC S/PDIF audio on the SMDK.
diff --git a/sound/soc/samsung/Makefile b/sound/soc/samsung/Makefile
index fe694cc5c3a3..705d4e8a6724 100644
--- a/sound/soc/samsung/Makefile
+++ b/sound/soc/samsung/Makefile
@@ -8,7 +8,7 @@ snd-soc-samsung-spdif-objs := spdif.o
8snd-soc-pcm-objs := pcm.o 8snd-soc-pcm-objs := pcm.o
9snd-soc-i2s-objs := i2s.o 9snd-soc-i2s-objs := i2s.o
10 10
11obj-$(CONFIG_ASOC_SAMSUNG) += snd-soc-s3c24xx.o 11obj-$(CONFIG_SND_SOC_SAMSUNG) += snd-soc-s3c24xx.o
12obj-$(CONFIG_SND_S3C24XX_I2S) += snd-soc-s3c24xx-i2s.o 12obj-$(CONFIG_SND_S3C24XX_I2S) += snd-soc-s3c24xx-i2s.o
13obj-$(CONFIG_SND_SAMSUNG_AC97) += snd-soc-ac97.o 13obj-$(CONFIG_SND_SAMSUNG_AC97) += snd-soc-ac97.o
14obj-$(CONFIG_SND_S3C2412_SOC_I2S) += snd-soc-s3c2412-i2s.o 14obj-$(CONFIG_SND_S3C2412_SOC_I2S) += snd-soc-s3c2412-i2s.o
@@ -36,20 +36,20 @@ snd-soc-s3c64xx-smartq-wm8987-objs := smartq_wm8987.o
36snd-soc-goni-wm8994-objs := goni_wm8994.o 36snd-soc-goni-wm8994-objs := goni_wm8994.o
37snd-soc-smdk-spdif-objs := smdk_spdif.o 37snd-soc-smdk-spdif-objs := smdk_spdif.o
38 38
39obj-$(CONFIG_ASOC_SAMSUNG_JIVE_WM8750) += snd-soc-jive-wm8750.o 39obj-$(CONFIG_SND_SOC_SAMSUNG_JIVE_WM8750) += snd-soc-jive-wm8750.o
40obj-$(CONFIG_ASOC_SAMSUNG_NEO1973_WM8753) += snd-soc-neo1973-wm8753.o 40obj-$(CONFIG_SND_SOC_SAMSUNG_NEO1973_WM8753) += snd-soc-neo1973-wm8753.o
41obj-$(CONFIG_ASOC_SAMSUNG_NEO1973_GTA02_WM8753) += snd-soc-neo1973-gta02-wm8753.o 41obj-$(CONFIG_SND_SOC_SAMSUNG_NEO1973_GTA02_WM8753) += snd-soc-neo1973-gta02-wm8753.o
42obj-$(CONFIG_ASOC_SAMSUNG_SMDK2443_WM9710) += snd-soc-smdk2443-wm9710.o 42obj-$(CONFIG_SND_SOC_SAMSUNG_SMDK2443_WM9710) += snd-soc-smdk2443-wm9710.o
43obj-$(CONFIG_ASOC_SAMSUNG_LN2440SBC_ALC650) += snd-soc-ln2440sbc-alc650.o 43obj-$(CONFIG_SND_SOC_SAMSUNG_LN2440SBC_ALC650) += snd-soc-ln2440sbc-alc650.o
44obj-$(CONFIG_ASOC_SAMSUNG_S3C24XX_UDA134X) += snd-soc-s3c24xx-uda134x.o 44obj-$(CONFIG_SND_SOC_SAMSUNG_S3C24XX_UDA134X) += snd-soc-s3c24xx-uda134x.o
45obj-$(CONFIG_ASOC_SAMSUNG_SIMTEC) += snd-soc-s3c24xx-simtec.o 45obj-$(CONFIG_SND_SOC_SAMSUNG_SIMTEC) += snd-soc-s3c24xx-simtec.o
46obj-$(CONFIG_ASOC_SAMSUNG_SIMTEC_HERMES) += snd-soc-s3c24xx-simtec-hermes.o 46obj-$(CONFIG_SND_SOC_SAMSUNG_SIMTEC_HERMES) += snd-soc-s3c24xx-simtec-hermes.o
47obj-$(CONFIG_ASOC_SAMSUNG_SIMTEC_TLV320AIC23) += snd-soc-s3c24xx-simtec-tlv320aic23.o 47obj-$(CONFIG_SND_SOC_SAMSUNG_SIMTEC_TLV320AIC23) += snd-soc-s3c24xx-simtec-tlv320aic23.o
48obj-$(CONFIG_ASOC_SAMSUNG_H1940_UDA1380) += snd-soc-h1940-uda1380.o 48obj-$(CONFIG_SND_SOC_SAMSUNG_H1940_UDA1380) += snd-soc-h1940-uda1380.o
49obj-$(CONFIG_ASOC_SAMSUNG_RX1950_UDA1380) += snd-soc-rx1950-uda1380.o 49obj-$(CONFIG_SND_SOC_SAMSUNG_RX1950_UDA1380) += snd-soc-rx1950-uda1380.o
50obj-$(CONFIG_ASOC_SAMSUNG_SMDK_WM8580) += snd-soc-smdk-wm8580.o 50obj-$(CONFIG_SND_SOC_SAMSUNG_SMDK_WM8580) += snd-soc-smdk-wm8580.o
51obj-$(CONFIG_ASOC_SAMSUNG_SMDK_WM8994) += snd-soc-smdk-wm8994.o 51obj-$(CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994) += snd-soc-smdk-wm8994.o
52obj-$(CONFIG_ASOC_SAMSUNG_SMDK_WM9713) += snd-soc-smdk-wm9713.o 52obj-$(CONFIG_SND_SOC_SAMSUNG_SMDK_WM9713) += snd-soc-smdk-wm9713.o
53obj-$(CONFIG_ASOC_SMARTQ) += snd-soc-s3c64xx-smartq-wm8987.o 53obj-$(CONFIG_SND_SOC_SMARTQ) += snd-soc-s3c64xx-smartq-wm8987.o
54obj-$(CONFIG_ASOC_SAMSUNG_SMDK_SPDIF) += snd-soc-smdk-spdif.o 54obj-$(CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF) += snd-soc-smdk-spdif.o
55obj-$(CONFIG_ASOC_GONI_AQUILA_WM8994) += snd-soc-goni-wm8994.o 55obj-$(CONFIG_SND_SOC_GONI_AQUILA_WM8994) += snd-soc-goni-wm8994.o
generated by cgit v1.2.2 (git 2.25.0) at 2025-09-01 23:29:55 -0400