diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-24 20:34:20 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-24 23:08:36 +0100 |
| commit | d472d1a1c82ade81d2854db2ff4c9694ed66612e (patch) | |
| tree | 66b00d6d13a73ef4aff17bb35c72926d4cd12940 /arch/arm/plat-s5p/cpu.c | |
| parent | 9bfe99a8f95122f83f3c894b1071b61e2b6d4990 (diff) | |
| parent | d01cd639c96cd683a22432afd4c39ea690c87f16 (diff) | |
Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into devel-stable
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/plat-s5p/cpu.c')
| -rw-r--r-- | arch/arm/plat-s5p/cpu.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/plat-s5p/cpu.c b/arch/arm/plat-s5p/cpu.c index f92e5de3a75..75cb8c37ca2 100644 --- a/arch/arm/plat-s5p/cpu.c +++ b/arch/arm/plat-s5p/cpu.c @@ -19,12 +19,14 @@ #include <plat/cpu.h> #include <plat/s5p6440.h> #include <plat/s5p6442.h> +#include <plat/s5pc100.h> #include <plat/s5pv210.h> /* table of supported CPUs */ static const char name_s5p6440[] = "S5P6440"; static const char name_s5p6442[] = "S5P6442"; +static const char name_s5pc100[] = "S5PC100"; static const char name_s5pv210[] = "S5PV210/S5PC110"; static struct cpu_table cpu_ids[] __initdata = { @@ -45,6 +47,14 @@ static struct cpu_table cpu_ids[] __initdata = { .init = s5p6442_init, .name = name_s5p6442, }, { + .idcode = 0x43100000, + .idmask = 0xfffff000, + .map_io = s5pc100_map_io, + .init_clocks = s5pc100_init_clocks, + .init_uarts = s5pc100_init_uarts, + .init = s5pc100_init, + .name = name_s5pc100, + }, { .idcode = 0x43110000, .idmask = 0xfffff000, .map_io = s5pv210_map_io, |