Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b130d5c2 authored by Kukjin Kim's avatar Kukjin Kim
Browse files

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: default avatarFelipe Balbi <balbi@ti.com>
[for the framebuffer (video) part:]
Acked-by: default avatarFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
[For the watchdog-part:]
Acked-by: default avatarWim 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: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 507164d2

arch/arm/Kconfig

+11 −12
Original line number Diff line number Diff line
@@ -763,22 +763,21 @@ config ARCH_SA1100 
	help

	  Support for StrongARM 11x0 based boards.



config ARCH_S3C2410

	bool "Samsung S3C2410, S3C2412, S3C2413, S3C2416, S3C2440, S3C2442, S3C2443, S3C2450"

config ARCH_S3C24XX

	bool "Samsung S3C24XX SoCs"

	select GENERIC_GPIO

	select ARCH_HAS_CPUFREQ

	select HAVE_CLK

	select CLKDEV_LOOKUP

	select ARCH_USES_GETTIMEOFFSET

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C_RTC if RTC_CLASS

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	help

	  Samsung S3C2410X CPU based systems, such as the Simtec Electronics

	  BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or

	  the Samsung SMDK2410 development board (and derivatives).



	  Note, the S3C2416 and the S3C2450 are so close that they even share

	  the same SoC ID code. This means that there is no separate machine

	  directory (no arch/arm/mach-s3c2450) as the S3C2416 was first.

	  Samsung S3C2410, S3C2412, S3C2413, S3C2416, S3C2440, S3C2442, S3C2443

	  and S3C2450 SoCs based systems, such as the Simtec Electronics BAST

	  (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or the

	  Samsung SMDK2410 development board (and derivatives).



config ARCH_S3C64XX

	bool "Samsung S3C64XX"
@@ -1068,7 +1067,7 @@ source "arch/arm/plat-s5p/Kconfig" 


source "arch/arm/plat-spear/Kconfig"



if ARCH_S3C2410

if ARCH_S3C24XX

source "arch/arm/mach-s3c2410/Kconfig"

source "arch/arm/mach-s3c2412/Kconfig"

source "arch/arm/mach-s3c2416/Kconfig"
@@ -1590,7 +1589,7 @@ source kernel/Kconfig.preempt 


config HZ

	int

	default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P64X0 || \

	default 200 if ARCH_EBSA110 || ARCH_S3C24XX || ARCH_S5P64X0 || \

		ARCH_S5PV210 || ARCH_EXYNOS4

	default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER

	default AT91_TIMER_HZ if ARCH_AT91
@@ -2116,7 +2115,7 @@ config CPU_FREQ_S3C 


config CPU_FREQ_S3C24XX

	bool "CPUfreq driver for Samsung S3C24XX series CPUs (EXPERIMENTAL)"

	depends on ARCH_S3C2410 && CPU_FREQ && EXPERIMENTAL

	depends on ARCH_S3C24XX && CPU_FREQ && EXPERIMENTAL

	select CPU_FREQ_S3C

	help

	  This enables the CPUfreq driver for the Samsung S3C24XX family

arch/arm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ machine-$(CONFIG_ARCH_PRIMA2) := prima2 
machine-$(CONFIG_ARCH_PXA)		:= pxa

machine-$(CONFIG_ARCH_REALVIEW)		:= realview

machine-$(CONFIG_ARCH_RPC)		:= rpc

machine-$(CONFIG_ARCH_S3C2410)		:= s3c2410 s3c2412 s3c2416 s3c2440 s3c2443

machine-$(CONFIG_ARCH_S3C24XX)		:= s3c2410 s3c2412 s3c2416 s3c2440 s3c2443

machine-$(CONFIG_ARCH_S3C64XX)		:= s3c64xx

machine-$(CONFIG_ARCH_S5P64X0)		:= s5p64x0

machine-$(CONFIG_ARCH_S5PC100)		:= s5pc100

arch/arm/boot/compressed/head.S

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 
		add	\rb, \rb, #0x00010000	@ Ser1

#endif

		.endm

#elif defined(CONFIG_ARCH_S3C2410)

#elif defined(CONFIG_ARCH_S3C24XX)

		.macro loadsp, rb, tmp

		mov	\rb, #0x50000000

		add	\rb, \rb, #0x4000 * CONFIG_S3C_LOWLEVEL_UART_PORT

arch/arm/configs/mini2440_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ CONFIG_MODULE_UNLOAD=y 
CONFIG_MODULE_FORCE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_BLK_DEV_INTEGRITY=y

CONFIG_ARCH_S3C2410=y

CONFIG_ARCH_S3C24XX=y

CONFIG_S3C_ADC=y

CONFIG_S3C24XX_PWM=y

CONFIG_MACH_MINI2440=y

arch/arm/configs/s3c2410_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ CONFIG_SLAB=y 
CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_ARCH_S3C2410=y

CONFIG_ARCH_S3C24XX=y

CONFIG_S3C_BOOT_ERROR_RESET=y

CONFIG_S3C_ADC=y

CONFIG_S3C24XX_PWM=y