diff options
author | Rob Herring <rob.herring@calxeda.com> | 2012-10-25 13:19:52 -0400 |
---|---|---|
committer | Rob Herring <rob.herring@calxeda.com> | 2012-10-31 14:47:01 -0400 |
commit | e095c0d122c09efabe7d4136ce77f72c636c4879 (patch) | |
tree | 71677fcb8933ee8694b8aebfe096e5c887ae8d49 /arch/arm/mach-highbank/highbank.c | |
parent | 7a2848d369b2b9281400e6c9f08e21ec71cd1dcb (diff) |
ARM: highbank: Add initial ECX-2000 support
And initial Calxeda ECX-2000 SOC support. This adds Cortex-A15 peripherals
and machine DT match name.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-highbank/highbank.c')
-rw-r--r-- | arch/arm/mach-highbank/highbank.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c index 3da921a1a7f6..3e60e5744157 100644 --- a/arch/arm/mach-highbank/highbank.c +++ b/arch/arm/mach-highbank/highbank.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <linux/smp.h> | 26 | #include <linux/smp.h> |
27 | #include <linux/amba/bus.h> | 27 | #include <linux/amba/bus.h> |
28 | 28 | ||
29 | #include <asm/arch_timer.h> | ||
29 | #include <asm/cacheflush.h> | 30 | #include <asm/cacheflush.h> |
30 | #include <asm/smp_plat.h> | 31 | #include <asm/smp_plat.h> |
31 | #include <asm/smp_twd.h> | 32 | #include <asm/smp_twd.h> |
@@ -70,6 +71,7 @@ void highbank_set_cpu_jump(int cpu, void *jump_addr) | |||
70 | } | 71 | } |
71 | 72 | ||
72 | const static struct of_device_id irq_match[] = { | 73 | const static struct of_device_id irq_match[] = { |
74 | { .compatible = "arm,cortex-a15-gic", .data = gic_of_init, }, | ||
73 | { .compatible = "arm,cortex-a9-gic", .data = gic_of_init, }, | 75 | { .compatible = "arm,cortex-a9-gic", .data = gic_of_init, }, |
74 | {} | 76 | {} |
75 | }; | 77 | }; |
@@ -126,6 +128,9 @@ static void __init highbank_timer_init(void) | |||
126 | sp804_clockevents_init(timer_base, irq, "timer0"); | 128 | sp804_clockevents_init(timer_base, irq, "timer0"); |
127 | 129 | ||
128 | twd_local_timer_of_register(); | 130 | twd_local_timer_of_register(); |
131 | |||
132 | arch_timer_of_register(); | ||
133 | arch_timer_sched_clock_init(); | ||
129 | } | 134 | } |
130 | 135 | ||
131 | static struct sys_timer highbank_timer = { | 136 | static struct sys_timer highbank_timer = { |
@@ -200,6 +205,7 @@ static void __init highbank_init(void) | |||
200 | 205 | ||
201 | static const char *highbank_match[] __initconst = { | 206 | static const char *highbank_match[] __initconst = { |
202 | "calxeda,highbank", | 207 | "calxeda,highbank", |
208 | "calxeda,ecx-2000", | ||
203 | NULL, | 209 | NULL, |
204 | }; | 210 | }; |
205 | 211 | ||