tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

Kukjin Kim b130d5c2 507164d2

+45 -46
+11 -12
arch/arm/Kconfig
··· 763 763 help 764 764 Support for StrongARM 11x0 based boards. 765 765 766 - config ARCH_S3C2410 767 - bool "Samsung S3C2410, S3C2412, S3C2413, S3C2416, S3C2440, S3C2442, S3C2443, S3C2450" 766 + config ARCH_S3C24XX 767 + bool "Samsung S3C24XX SoCs" 768 768 select GENERIC_GPIO 769 769 select ARCH_HAS_CPUFREQ 770 770 select HAVE_CLK 771 771 select CLKDEV_LOOKUP 772 772 select ARCH_USES_GETTIMEOFFSET 773 773 select HAVE_S3C2410_I2C if I2C 774 + select HAVE_S3C_RTC if RTC_CLASS 775 + select HAVE_S3C2410_WATCHDOG if WATCHDOG 774 776 help 775 - Samsung S3C2410X CPU based systems, such as the Simtec Electronics 776 - BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or 777 - the Samsung SMDK2410 development board (and derivatives). 778 - 779 - Note, the S3C2416 and the S3C2450 are so close that they even share 780 - the same SoC ID code. This means that there is no separate machine 781 - directory (no arch/arm/mach-s3c2450) as the S3C2416 was first. 777 + Samsung S3C2410, S3C2412, S3C2413, S3C2416, S3C2440, S3C2442, S3C2443 778 + and S3C2450 SoCs based systems, such as the Simtec Electronics BAST 779 + (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or the 780 + Samsung SMDK2410 development board (and derivatives). 782 781 783 782 config ARCH_S3C64XX 784 783 bool "Samsung S3C64XX" ··· 1067 1068 1068 1069 source "arch/arm/plat-spear/Kconfig" 1069 1070 1070 - if ARCH_S3C2410 1071 + if ARCH_S3C24XX 1071 1072 source "arch/arm/mach-s3c2410/Kconfig" 1072 1073 source "arch/arm/mach-s3c2412/Kconfig" 1073 1074 source "arch/arm/mach-s3c2416/Kconfig" ··· 1589 1590 1590 1591 config HZ 1591 1592 int 1592 - default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P64X0 || \ 1593 + default 200 if ARCH_EBSA110 || ARCH_S3C24XX || ARCH_S5P64X0 || \ 1593 1594 ARCH_S5PV210 || ARCH_EXYNOS4 1594 1595 default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER 1595 1596 default AT91_TIMER_HZ if ARCH_AT91 ··· 2115 2116 2116 2117 config CPU_FREQ_S3C24XX 2117 2118 bool "CPUfreq driver for Samsung S3C24XX series CPUs (EXPERIMENTAL)" 2118 - depends on ARCH_S3C2410 && CPU_FREQ && EXPERIMENTAL 2119 + depends on ARCH_S3C24XX && CPU_FREQ && EXPERIMENTAL 2119 2120 select CPU_FREQ_S3C 2120 2121 help 2121 2122 This enables the CPUfreq driver for the Samsung S3C24XX family
+1 -1
arch/arm/Makefile
··· 175 175 machine-$(CONFIG_ARCH_PXA) := pxa 176 176 machine-$(CONFIG_ARCH_REALVIEW) := realview 177 177 machine-$(CONFIG_ARCH_RPC) := rpc 178 - machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2412 s3c2416 s3c2440 s3c2443 178 + machine-$(CONFIG_ARCH_S3C24XX) := s3c2410 s3c2412 s3c2416 s3c2440 s3c2443 179 179 machine-$(CONFIG_ARCH_S3C64XX) := s3c64xx 180 180 machine-$(CONFIG_ARCH_S5P64X0) := s5p64x0 181 181 machine-$(CONFIG_ARCH_S5PC100) := s5pc100
+1 -1
arch/arm/boot/compressed/head.S
··· 58 58 add \rb, \rb, #0x00010000 @ Ser1 59 59 #endif 60 60 .endm 61 - #elif defined(CONFIG_ARCH_S3C2410) 61 + #elif defined(CONFIG_ARCH_S3C24XX) 62 62 .macro loadsp, rb, tmp 63 63 mov \rb, #0x50000000 64 64 add \rb, \rb, #0x4000 * CONFIG_S3C_LOWLEVEL_UART_PORT
+1 -1
arch/arm/configs/mini2440_defconfig
··· 13 13 CONFIG_MODULE_FORCE_UNLOAD=y 14 14 # CONFIG_BLK_DEV_BSG is not set 15 15 CONFIG_BLK_DEV_INTEGRITY=y 16 - CONFIG_ARCH_S3C2410=y 16 + CONFIG_ARCH_S3C24XX=y 17 17 CONFIG_S3C_ADC=y 18 18 CONFIG_S3C24XX_PWM=y 19 19 CONFIG_MACH_MINI2440=y
+1 -1
arch/arm/configs/s3c2410_defconfig
··· 9 9 CONFIG_MODULES=y 10 10 CONFIG_MODULE_UNLOAD=y 11 11 # CONFIG_BLK_DEV_BSG is not set 12 - CONFIG_ARCH_S3C2410=y 12 + CONFIG_ARCH_S3C24XX=y 13 13 CONFIG_S3C_BOOT_ERROR_RESET=y 14 14 CONFIG_S3C_ADC=y 15 15 CONFIG_S3C24XX_PWM=y
+1 -1
arch/arm/configs/tct_hammer_defconfig
··· 14 14 CONFIG_MODULES=y 15 15 CONFIG_MODULE_UNLOAD=y 16 16 # CONFIG_BLK_DEV_BSG is not set 17 - CONFIG_ARCH_S3C2410=y 17 + CONFIG_ARCH_S3C24XX=y 18 18 CONFIG_MACH_TCT_HAMMER=y 19 19 CONFIG_ZBOOT_ROM_TEXT=0x0 20 20 CONFIG_ZBOOT_ROM_BSS=0x0
+1 -1
arch/arm/mach-s3c2410/Kconfig
··· 4 4 5 5 config CPU_S3C2410 6 6 bool 7 - depends on ARCH_S3C2410 7 + depends on ARCH_S3C24XX 8 8 select CPU_ARM920T 9 9 select S3C2410_CLOCK 10 10 select CPU_LLSERIAL_S3C2410
+2 -2
arch/arm/mach-s3c2412/Kconfig
··· 4 4 5 5 config CPU_S3C2412 6 6 bool 7 - depends on ARCH_S3C2410 7 + depends on ARCH_S3C24XX 8 8 select CPU_ARM926T 9 9 select CPU_LLSERIAL_S3C2440 10 10 select S3C2412_PM if PM ··· 14 14 15 15 config CPU_S3C2412_ONLY 16 16 bool 17 - depends on ARCH_S3C2410 && !CPU_S3C2410 && \ 17 + depends on ARCH_S3C24XX && !CPU_S3C2410 && \ 18 18 !CPU_S3C2416 && !CPU_S3C2440 && !CPU_S3C2442 && \ 19 19 !CPU_S3C2443 && CPU_S3C2412 20 20 default y if CPU_S3C2412
+1 -1
arch/arm/mach-s3c2416/Kconfig
··· 9 9 10 10 config CPU_S3C2416 11 11 bool 12 - depends on ARCH_S3C2410 12 + depends on ARCH_S3C24XX 13 13 select CPU_ARM926T 14 14 select S3C2416_DMA if S3C2410_DMA 15 15 select CPU_LLSERIAL_S3C2440
+1 -1
arch/arm/mach-s3c2443/Kconfig
··· 4 4 5 5 config CPU_S3C2443 6 6 bool 7 - depends on ARCH_S3C2410 7 + depends on ARCH_S3C24XX 8 8 select CPU_ARM920T 9 9 select S3C2443_DMA if S3C2410_DMA 10 10 select CPU_LLSERIAL_S3C2440
+3 -3
arch/arm/plat-s3c24xx/Kconfig
··· 4 4 5 5 config PLAT_S3C24XX 6 6 bool 7 - depends on ARCH_S3C2410 7 + depends on ARCH_S3C24XX 8 8 default y 9 9 select NO_IOPORT 10 10 select ARCH_REQUIRE_GPIOLIB ··· 84 84 85 85 config S3C2410_DMA 86 86 bool "S3C2410 DMA support" 87 - depends on ARCH_S3C2410 87 + depends on ARCH_S3C24XX 88 88 select S3C_DMA 89 89 help 90 90 S3C2410 DMA support. This is needed for drivers like sound which ··· 93 93 94 94 config S3C2410_DMA_DEBUG 95 95 bool "S3C2410 DMA support debug" 96 - depends on ARCH_S3C2410 && S3C2410_DMA 96 + depends on ARCH_S3C24XX && S3C2410_DMA 97 97 help 98 98 Enable debugging output for the DMA code. This option sends info 99 99 to the kernel log, at priority KERN_DEBUG.
+1 -1
arch/arm/plat-s3c24xx/Makefile
··· 35 35 obj-$(CONFIG_S3C2410_CPUFREQ_UTILS) += s3c2410-cpufreq-utils.o 36 36 37 37 # device specific setup and/or initialisation 38 - obj-$(CONFIG_ARCH_S3C2410) += setup-i2c.o 38 + obj-$(CONFIG_ARCH_S3C24XX) += setup-i2c.o 39 39 obj-$(CONFIG_S3C2410_SETUP_TS) += setup-ts.o 40 40 41 41 # machine common support
+2 -2
arch/arm/plat-samsung/Kconfig
··· 205 205 206 206 config S3C_DEV_WDT 207 207 bool 208 - default y if ARCH_S3C2410 208 + default y if ARCH_S3C24XX 209 209 help 210 210 Complie in platform device definition for Watchdog Timer 211 211 ··· 264 264 265 265 config SAMSUNG_DEV_PWM 266 266 bool 267 - default y if ARCH_S3C2410 267 + default y if ARCH_S3C24XX 268 268 help 269 269 Compile in platform device definition for PWM Timer 270 270
+1 -1
drivers/input/touchscreen/Kconfig
··· 215 215 216 216 config TOUCHSCREEN_S3C2410 217 217 tristate "Samsung S3C2410/generic touchscreen input driver" 218 - depends on ARCH_S3C2410 || SAMSUNG_DEV_TS 218 + depends on ARCH_S3C24XX || SAMSUNG_DEV_TS 219 219 select S3C_ADC 220 220 help 221 221 Say Y here if you have the s3c2410 touchscreen.
+1 -1
drivers/leds/Kconfig
··· 69 69 config LEDS_S3C24XX 70 70 tristate "LED Support for Samsung S3C24XX GPIO LEDs" 71 71 depends on LEDS_CLASS 72 - depends on ARCH_S3C2410 72 + depends on ARCH_S3C24XX 73 73 help 74 74 This option enables support for LEDs connected to GPIO lines 75 75 on Samsung S3C24XX series CPUs, such as the S3C2410 and S3C2440.
+1 -1
drivers/mmc/host/Kconfig
··· 395 395 396 396 config MMC_S3C 397 397 tristate "Samsung S3C SD/MMC Card Interface support" 398 - depends on ARCH_S3C2410 398 + depends on ARCH_S3C24XX 399 399 help 400 400 This selects a driver for the MCI interface found in 401 401 Samsung's S3C2410, S3C2412, S3C2440, S3C2442 CPUs.
+1 -1
drivers/mtd/nand/Kconfig
··· 187 187 188 188 config MTD_NAND_S3C2410 189 189 tristate "NAND Flash support for Samsung S3C SoCs" 190 - depends on ARCH_S3C2410 || ARCH_S3C64XX 190 + depends on ARCH_S3C24XX || ARCH_S3C64XX 191 191 help 192 192 This enables the NAND flash controller on the S3C24xx and S3C64xx 193 193 SoCs
+1 -1
drivers/rtc/Kconfig
··· 748 748 749 749 config RTC_DRV_S3C 750 750 tristate "Samsung S3C series SoC RTC" 751 - depends on ARCH_S3C2410 || ARCH_S3C64XX || HAVE_S3C_RTC 751 + depends on ARCH_S3C64XX || HAVE_S3C_RTC 752 752 help 753 753 RTC (Realtime Clock) driver for the clock inbuilt into the 754 754 Samsung S3C24XX series of SoCs. This can provide periodic
+1 -1
drivers/spi/Kconfig
··· 281 281 282 282 config SPI_S3C24XX 283 283 tristate "Samsung S3C24XX series SPI" 284 - depends on ARCH_S3C2410 && EXPERIMENTAL 284 + depends on ARCH_S3C24XX && EXPERIMENTAL 285 285 select SPI_BITBANG 286 286 help 287 287 SPI driver for Samsung S3C24XX series ARM SoCs
+1 -1
drivers/usb/Kconfig
··· 37 37 # ARM: 38 38 default y if SA1111 39 39 default y if ARCH_OMAP 40 - default y if ARCH_S3C2410 40 + default y if ARCH_S3C24XX 41 41 default y if PXA27x 42 42 default y if PXA3xx 43 43 default y if ARCH_EP93XX
+2 -2
drivers/usb/gadget/Kconfig
··· 284 284 285 285 config USB_S3C2410 286 286 tristate "S3C2410 USB Device Controller" 287 - depends on ARCH_S3C2410 287 + depends on ARCH_S3C24XX 288 288 help 289 289 Samsung's S3C2410 is an ARM-4 processor with an integrated 290 290 full speed USB 1.1 device controller. It has 4 configurable ··· 299 299 300 300 config USB_S3C_HSUDC 301 301 tristate "S3C2416, S3C2443 and S3C2450 USB Device Controller" 302 - depends on ARCH_S3C2410 302 + depends on ARCH_S3C24XX 303 303 select USB_GADGET_DUALSPEED 304 304 help 305 305 Samsung's S3C2416, S3C2443 and S3C2450 is an ARM9 based SoC
+1 -1
drivers/usb/host/ohci-hcd.c
··· 1000 1000 #define SA1111_DRIVER ohci_hcd_sa1111_driver 1001 1001 #endif 1002 1002 1003 - #if defined(CONFIG_ARCH_S3C2410) || defined(CONFIG_ARCH_S3C64XX) 1003 + #if defined(CONFIG_ARCH_S3C24XX) || defined(CONFIG_ARCH_S3C64XX) 1004 1004 #include "ohci-s3c2410.c" 1005 1005 #define PLATFORM_DRIVER ohci_hcd_s3c2410_driver 1006 1006 #endif
+1 -1
drivers/video/Kconfig
··· 2061 2061 2062 2062 config FB_S3C2410 2063 2063 tristate "S3C2410 LCD framebuffer support" 2064 - depends on FB && ARCH_S3C2410 2064 + depends on FB && ARCH_S3C24XX 2065 2065 select FB_CFB_FILLRECT 2066 2066 select FB_CFB_COPYAREA 2067 2067 select FB_CFB_IMAGEBLIT
+1 -1
drivers/watchdog/Kconfig
··· 170 170 171 171 config S3C2410_WATCHDOG 172 172 tristate "S3C2410 Watchdog" 173 - depends on ARCH_S3C2410 || HAVE_S3C2410_WATCHDOG 173 + depends on HAVE_S3C2410_WATCHDOG 174 174 select WATCHDOG_CORE 175 175 help 176 176 Watchdog timer block in the Samsung SoCs. This will reboot
+6 -6
sound/soc/samsung/Kconfig
··· 1 1 config SND_SOC_SAMSUNG 2 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 4 select S3C64XX_DMA if ARCH_S3C64XX 5 - select S3C2410_DMA if ARCH_S3C2410 5 + select S3C2410_DMA if ARCH_S3C24XX 6 6 help 7 7 Say Y or M if you want to add support for codecs attached to 8 8 the Samsung SoCs' Audio interfaces. You will also need to ··· 84 84 85 85 config SND_SOC_SAMSUNG_LN2440SBC_ALC650 86 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 88 select S3C2410_DMA 89 89 select AC97_BUS 90 90 select SND_SOC_AC97_CODEC ··· 95 95 96 96 config SND_SOC_SAMSUNG_S3C24XX_UDA134X 97 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 99 select SND_S3C24XX_I2S 100 100 select SND_SOC_L3 101 101 select SND_SOC_UDA134X ··· 107 107 108 108 config SND_SOC_SAMSUNG_SIMTEC_TLV320AIC23 109 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 111 select SND_S3C24XX_I2S 112 112 select SND_SOC_TLV320AIC23 113 113 select SND_SOC_SAMSUNG_SIMTEC 114 114 115 115 config SND_SOC_SAMSUNG_SIMTEC_HERMES 116 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 118 select SND_S3C24XX_I2S 119 119 select SND_SOC_TLV320AIC3X 120 120 select SND_SOC_SAMSUNG_SIMTEC