diff options
| -rw-r--r-- | arch/arm/Kconfig | 6 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2416/Kconfig | 3 | ||||
| -rw-r--r-- | 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 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 | ||
| 649 | config ARCH_S3C2410 | 649 | config 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 | |||
| 659 | config ARCH_S3C64XX | 663 | config 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 | |||
| 7 | config CPU_S3C2416 | 10 | config 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 @@ | |||
| 58 | static const char name_s3c2400[] = "S3C2400"; | 58 | static const char name_s3c2400[] = "S3C2400"; |
| 59 | static const char name_s3c2410[] = "S3C2410"; | 59 | static const char name_s3c2410[] = "S3C2410"; |
| 60 | static const char name_s3c2412[] = "S3C2412"; | 60 | static const char name_s3c2412[] = "S3C2412"; |
| 61 | static const char name_s3c2416[] = "S3C2416"; | 61 | static const char name_s3c2416[] = "S3C2416/S3C2450"; |
| 62 | static const char name_s3c2440[] = "S3C2440"; | 62 | static const char name_s3c2440[] = "S3C2440"; |
| 63 | static const char name_s3c2442[] = "S3C2442"; | 63 | static const char name_s3c2442[] = "S3C2442"; |
| 64 | static const char name_s3c2442b[] = "S3C2442B"; | 64 | static const char name_s3c2442b[] = "S3C2442B"; |
