diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2012-02-03 00:29:23 -0500 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-03-02 17:44:51 -0500 |
commit | b130d5c29544fe4cedafd35b112d27a06550d844 (patch) | |
tree | 3a12051f935c7a3ea819a4fee606b8a139523c9b /sound/soc | |
parent | 507164d22357b26ac73411f42765054045ca0b76 (diff) |
ARM: S3C24XX: change the ARCH_S3C2410 to ARCH_S3C24XX
This patch changes the ARCH name to "ARCH_S3C24XX" for Samsung
S3C2410, S3C2412, S3C2413, S3C2416, S3C2440, S3C2442, S3C2443,
and S3C2450 SoCs so that we can merge the mach-xxx directories
and plat-s3c24xx dir. to just one mach-s3c24xx for them.
I think this should be sent to upstream via samsung tree because
this touches many samsung stuff.
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: Chris Ball <cjb@laptop.org>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
[for the gadget part:]
Acked-by: Felipe Balbi <balbi@ti.com>
[for the framebuffer (video) part:]
Acked-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
[For the watchdog-part:]
Acked-by: Wim Van Sebroeck <wim@iguana.be>
Cc: Sangbeom Kim <sbkim73@samsung.com>
Cc: Liam Girdwood <lrg@ti.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/samsung/Kconfig | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig index f3417f2311b8..fe3995ce9b38 100644 --- a/sound/soc/samsung/Kconfig +++ b/sound/soc/samsung/Kconfig | |||
@@ -1,8 +1,8 @@ | |||
1 | config SND_SOC_SAMSUNG | 1 | config 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_EXYNOS4 | 3 | depends on ARCH_S3C24XX || ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_S5P64X0 || ARCH_EXYNOS4 |
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_S3C24XX |
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 Samsung SoCs' Audio interfaces. You will also need to | 8 | the Samsung SoCs' Audio interfaces. You will also need to |
@@ -84,7 +84,7 @@ config SND_SOC_SAMSUNG_SMDK2443_WM9710 | |||
84 | 84 | ||
85 | config SND_SOC_SAMSUNG_LN2440SBC_ALC650 | 85 | config SND_SOC_SAMSUNG_LN2440SBC_ALC650 |
86 | tristate "SoC AC97 Audio support for LN2440SBC - ALC650" | 86 | tristate "SoC AC97 Audio support for LN2440SBC - ALC650" |
87 | depends on SND_SOC_SAMSUNG && ARCH_S3C2410 | 87 | depends on SND_SOC_SAMSUNG && ARCH_S3C24XX |
88 | select S3C2410_DMA | 88 | select S3C2410_DMA |
89 | select AC97_BUS | 89 | select AC97_BUS |
90 | select SND_SOC_AC97_CODEC | 90 | select SND_SOC_AC97_CODEC |
@@ -95,7 +95,7 @@ config SND_SOC_SAMSUNG_LN2440SBC_ALC650 | |||
95 | 95 | ||
96 | config SND_SOC_SAMSUNG_S3C24XX_UDA134X | 96 | config SND_SOC_SAMSUNG_S3C24XX_UDA134X |
97 | tristate "SoC I2S Audio support UDA134X wired to a S3C24XX" | 97 | tristate "SoC I2S Audio support UDA134X wired to a S3C24XX" |
98 | depends on SND_SOC_SAMSUNG && ARCH_S3C2410 | 98 | depends on SND_SOC_SAMSUNG && ARCH_S3C24XX |
99 | select SND_S3C24XX_I2S | 99 | select SND_S3C24XX_I2S |
100 | select SND_SOC_L3 | 100 | select SND_SOC_L3 |
101 | select SND_SOC_UDA134X | 101 | select SND_SOC_UDA134X |
@@ -107,14 +107,14 @@ config SND_SOC_SAMSUNG_SIMTEC | |||
107 | 107 | ||
108 | config SND_SOC_SAMSUNG_SIMTEC_TLV320AIC23 | 108 | config SND_SOC_SAMSUNG_SIMTEC_TLV320AIC23 |
109 | tristate "SoC I2S Audio support for TLV320AIC23 on Simtec boards" | 109 | tristate "SoC I2S Audio support for TLV320AIC23 on Simtec boards" |
110 | depends on SND_SOC_SAMSUNG && ARCH_S3C2410 | 110 | depends on SND_SOC_SAMSUNG && ARCH_S3C24XX |
111 | select SND_S3C24XX_I2S | 111 | select SND_S3C24XX_I2S |
112 | select SND_SOC_TLV320AIC23 | 112 | select SND_SOC_TLV320AIC23 |
113 | select SND_SOC_SAMSUNG_SIMTEC | 113 | select SND_SOC_SAMSUNG_SIMTEC |
114 | 114 | ||
115 | config SND_SOC_SAMSUNG_SIMTEC_HERMES | 115 | config SND_SOC_SAMSUNG_SIMTEC_HERMES |
116 | tristate "SoC I2S Audio support for Simtec Hermes board" | 116 | tristate "SoC I2S Audio support for Simtec Hermes board" |
117 | depends on SND_SOC_SAMSUNG && ARCH_S3C2410 | 117 | depends on SND_SOC_SAMSUNG && ARCH_S3C24XX |
118 | select SND_S3C24XX_I2S | 118 | select SND_S3C24XX_I2S |
119 | select SND_SOC_TLV320AIC3X | 119 | select SND_SOC_TLV320AIC3X |
120 | select SND_SOC_SAMSUNG_SIMTEC | 120 | select SND_SOC_SAMSUNG_SIMTEC |