Gitweb: http://git.kernel.org/linus/63b1f51b2405573d47bf5b9ab6e7cd5c697d3dcc
Commit: 63b1f51b2405573d47bf5b9ab6e7cd5c697d3dcc
Parent: eb90de4a2d2880f0037d2b2ba85a3e857a898b40
Author: Ben Dooks <ben-linux@fluff.org>
AuthorDate: Fri Apr 30 16:32:26 2010 +0900
Committer: Ben Dooks <ben-linux@fluff.org>
CommitDate: Mon May 10 11:44:47 2010 +0900
ARM: SAMSUNG: Update S3C2416 entry with S3C2450
These devices are so similar that they share the same SoC
ID code, so note this.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
---
arch/arm/Kconfig | 6 +++++-
arch/arm/mach-s3c2416/Kconfig | 3 +++
arch/arm/plat-s3c24xx/cpu.c | 2 +-
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 6785c33..3f8718f 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -647,7 +647,7 @@ config ARCH_SA1100
Support for StrongARM 11x0 based boards.
config ARCH_S3C2410
- bool "Samsung S3C2410, S3C2412, S3C2413, S3C2416, S3C2440, S3C2442, S3C2443"
+ bool "Samsung S3C2410, S3C2412, S3C2413, S3C2416, S3C2440, S3C2442, S3C2443, S3C2450"
select GENERIC_GPIO
select ARCH_HAS_CPUFREQ
select HAVE_CLK
@@ -656,6 +656,10 @@ config ARCH_S3C2410
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 seperate machine
+ directory (no arch/arm/mach-s3c2450) as the S3C2416 was first.
+
config ARCH_S3C64XX
bool "Samsung S3C64XX"
select PLAT_SAMSUNG
diff --git a/arch/arm/mach-s3c2416/Kconfig b/arch/arm/mach-s3c2416/Kconfig
index 6d077b2..29103a6 100644
--- a/arch/arm/mach-s3c2416/Kconfig
+++ b/arch/arm/mach-s3c2416/Kconfig
@@ -4,6 +4,9 @@
#
# Licensed under GPLv2
+# note, this also supports the S3C2450 which is so similar it has the same
+# ID code as the ...