diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2010-10-18 05:29:51 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-10-18 05:29:51 -0400 |
commit | a2e0d6249fa866ce7f5a8fe08a4d75511e4701c6 (patch) | |
tree | 9ff61cc5edcc4f59f2f170d390c174a7a50a12fa /arch/arm/plat-s5p/cpu.c | |
parent | 49b7a491b797305a0dc373e7f7a5d2a87955c819 (diff) |
ARM: S5P64X0: Add S5P64X0(S5P6440 and S5P6450) initialization support
This patch adds ARCH_S5P64X0 which can support S5P6440 and S5P6450 with
one kernel image. So moved some files of mach-s5p6440 into the new ARCH
directory mach-s5p64x0.
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/plat-s5p/cpu.c')
-rw-r--r-- | arch/arm/plat-s5p/cpu.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/arch/arm/plat-s5p/cpu.c b/arch/arm/plat-s5p/cpu.c index 57f08eee6d62..74f7f5a5446c 100644 --- a/arch/arm/plat-s5p/cpu.c +++ b/arch/arm/plat-s5p/cpu.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <plat/cpu.h> | 19 | #include <plat/cpu.h> |
20 | #include <plat/s5p6440.h> | 20 | #include <plat/s5p6440.h> |
21 | #include <plat/s5p6442.h> | 21 | #include <plat/s5p6442.h> |
22 | #include <plat/s5p6450.h> | ||
22 | #include <plat/s5pc100.h> | 23 | #include <plat/s5pc100.h> |
23 | #include <plat/s5pv210.h> | 24 | #include <plat/s5pv210.h> |
24 | #include <plat/s5pv310.h> | 25 | #include <plat/s5pv310.h> |
@@ -27,6 +28,7 @@ | |||
27 | 28 | ||
28 | static const char name_s5p6440[] = "S5P6440"; | 29 | static const char name_s5p6440[] = "S5P6440"; |
29 | static const char name_s5p6442[] = "S5P6442"; | 30 | static const char name_s5p6442[] = "S5P6442"; |
31 | static const char name_s5p6450[] = "S5P6450"; | ||
30 | static const char name_s5pc100[] = "S5PC100"; | 32 | static const char name_s5pc100[] = "S5PC100"; |
31 | static const char name_s5pv210[] = "S5PV210/S5PC110"; | 33 | static const char name_s5pv210[] = "S5PV210/S5PC110"; |
32 | static const char name_s5pv310[] = "S5PV310"; | 34 | static const char name_s5pv310[] = "S5PV310"; |
@@ -38,7 +40,7 @@ static struct cpu_table cpu_ids[] __initdata = { | |||
38 | .map_io = s5p6440_map_io, | 40 | .map_io = s5p6440_map_io, |
39 | .init_clocks = s5p6440_init_clocks, | 41 | .init_clocks = s5p6440_init_clocks, |
40 | .init_uarts = s5p6440_init_uarts, | 42 | .init_uarts = s5p6440_init_uarts, |
41 | .init = s5p6440_init, | 43 | .init = s5p64x0_init, |
42 | .name = name_s5p6440, | 44 | .name = name_s5p6440, |
43 | }, { | 45 | }, { |
44 | .idcode = 0x36442000, | 46 | .idcode = 0x36442000, |
@@ -49,6 +51,14 @@ static struct cpu_table cpu_ids[] __initdata = { | |||
49 | .init = s5p6442_init, | 51 | .init = s5p6442_init, |
50 | .name = name_s5p6442, | 52 | .name = name_s5p6442, |
51 | }, { | 53 | }, { |
54 | .idcode = 0x36450000, | ||
55 | .idmask = 0xffffff00, | ||
56 | .map_io = s5p6450_map_io, | ||
57 | .init_clocks = s5p6450_init_clocks, | ||
58 | .init_uarts = s5p6450_init_uarts, | ||
59 | .init = s5p64x0_init, | ||
60 | .name = name_s5p6450, | ||
61 | }, { | ||
52 | .idcode = 0x43100000, | 62 | .idcode = 0x43100000, |
53 | .idmask = 0xfffff000, | 63 | .idmask = 0xfffff000, |
54 | .map_io = s5pc100_map_io, | 64 | .map_io = s5pc100_map_io, |