diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 18:51:31 +0900 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 18:51:31 +0900 |
| commit | d48562abe29ceee66a6aad7b565b021ddd7f598a (patch) | |
| tree | 5f70539f7c3bc90ec9ec0f53c5105e45f8f508f9 /arch/arm/plat-s5p/cpu.c | |
| parent | 0df04f820b7ca5204329d1c235e509648fa8008d (diff) | |
| parent | a73e3e6f8f5847c00edb9dd7aab19d005a3d6e5c (diff) | |
| download | op-kernel-dev-d48562abe29ceee66a6aad7b565b021ddd7f598a.zip op-kernel-dev-d48562abe29ceee66a6aad7b565b021ddd7f598a.tar.gz | |
ARM: Merge for-2635-4/s5pc1xx-removal
Merge branch 'for-2635-4/s5pc1xx-removal' into for-2635-4/partial1
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 f92e5de..75cb8c3 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, |
