aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-04-30 03:32:26 -0400
committerBen Dooks <ben-linux@fluff.org>2010-05-09 22:44:47 -0400
commit63b1f51b2405573d47bf5b9ab6e7cd5c697d3dcc (patch)
treedb8949524533f70f61d64581d7eb83fab97c1063 /arch/arm
parenteb90de4a2d2880f0037d2b2ba85a3e857a898b40 (diff)
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>
Diffstat (limited to 'arch/arm')
-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
647 Support for StrongARM 11x0 based boards. 647 Support for StrongARM 11x0 based boards.
648 648
649config ARCH_S3C2410 649config ARCH_S3C2410
650 bool "Samsung S3C2410, S3C2412, S3C2413, S3C2416, S3C2440, S3C2442, S3C2443" 650 bool "Samsung S3C2410, S3C2412, S3C2413, S3C2416, S3C2440, S3C2442, S3C2443, S3C2450"
651 select GENERIC_GPIO 651 select GENERIC_GPIO
652 select ARCH_HAS_CPUFREQ 652 select ARCH_HAS_CPUFREQ
653 select HAVE_CLK 653 select HAVE_CLK
@@ -656,6 +656,10 @@ config ARCH_S3C2410
656 BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or 656 BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or
657 the Samsung SMDK2410 development board (and derivatives). 657 the Samsung SMDK2410 development board (and derivatives).
658 658
659 Note, the S3C2416 and the S3C2450 are so close that they even share
660 the same SoC ID code. This means that there is no seperate machine
661 directory (no arch/arm/mach-s3c2450) as the S3C2416 was first.
662
659config ARCH_S3C64XX 663config ARCH_S3C64XX
660 bool "Samsung S3C64XX" 664 bool "Samsung S3C64XX"
661 select PLAT_SAMSUNG 665 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 @@
4# 4#
5# Licensed under GPLv2 5# Licensed under GPLv2
6 6
7# note, this also supports the S3C2450 which is so similar it has the same
8# ID code as the S3C2416.
9
7config CPU_S3C2416 10config CPU_S3C2416
8 bool 11 bool
9 depends on ARCH_S3C2410 12 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 @@
58static const char name_s3c2400[] = "S3C2400"; 58static const char name_s3c2400[] = "S3C2400";
59static const char name_s3c2410[] = "S3C2410"; 59static const char name_s3c2410[] = "S3C2410";
60static const char name_s3c2412[] = "S3C2412"; 60static const char name_s3c2412[] = "S3C2412";
61static const char name_s3c2416[] = "S3C2416"; 61static const char name_s3c2416[] = "S3C2416/S3C2450";
62static const char name_s3c2440[] = "S3C2440"; 62static const char name_s3c2440[] = "S3C2440";
63static const char name_s3c2442[] = "S3C2442"; 63static const char name_s3c2442[] = "S3C2442";
64static const char name_s3c2442b[] = "S3C2442B"; 64static const char name_s3c2442b[] = "S3C2442B";