summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-04-30 16:32:26 +0900
committerBen Dooks <ben-linux@fluff.org>2010-05-10 11:44:47 +0900
commit63b1f51b2405573d47bf5b9ab6e7cd5c697d3dcc (patch)
treedb8949524533f70f61d64581d7eb83fab97c1063
parenteb90de4a2d2880f0037d2b2ba85a3e857a898b40 (diff)
downloadblackbird-op-linux-63b1f51b2405573d47bf5b9ab6e7cd5c697d3dcc.tar.gz
blackbird-op-linux-63b1f51b2405573d47bf5b9ab6e7cd5c697d3dcc.zip
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>
-rw-r--r--arch/arm/Kconfig6
-rw-r--r--arch/arm/mach-s3c2416/Kconfig3
-rw-r--r--arch/arm/plat-s3c24xx/cpu.c2
3 files changed, 9 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 6785c33908bf..3f8718fc4050 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 6d077b24d190..29103a6047de 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 S3C2416.
+
config CPU_S3C2416
bool
depends on ARCH_S3C2410
diff --git a/arch/arm/plat-s3c24xx/cpu.c b/arch/arm/plat-s3c24xx/cpu.c
index 32db85651af0..76d0858c3cbb 100644
--- a/arch/arm/plat-s3c24xx/cpu.c
+++ b/arch/arm/plat-s3c24xx/cpu.c
@@ -58,7 +58,7 @@
static const char name_s3c2400[] = "S3C2400";
static const char name_s3c2410[] = "S3C2410";
static const char name_s3c2412[] = "S3C2412";
-static const char name_s3c2416[] = "S3C2416";
+static const char name_s3c2416[] = "S3C2416/S3C2450";
static const char name_s3c2440[] = "S3C2440";
static const char name_s3c2442[] = "S3C2442";
static const char name_s3c2442b[] = "S3C2442B";
OpenPOWER on IntegriCloud