diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2012-10-25 19:19:52 +0200 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2012-10-31 19:47:01 +0100 |
| commit | e095c0d122c09efabe7d4136ce77f72c636c4879 (patch) | |
| tree | 71677fcb8933ee8694b8aebfe096e5c887ae8d49 | |
| parent | ARM: highbank: abstract out SCU usage (diff) | |
| download | linux-e095c0d122c09efabe7d4136ce77f72c636c4879.tar.xz linux-e095c0d122c09efabe7d4136ce77f72c636c4879.zip | |
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>
| -rw-r--r-- | arch/arm/mach-highbank/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-highbank/highbank.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-highbank/Kconfig b/arch/arm/mach-highbank/Kconfig index 0e1d0a42a3ea..551c97e87a78 100644 --- a/arch/arm/mach-highbank/Kconfig +++ b/arch/arm/mach-highbank/Kconfig @@ -1,5 +1,5 @@ config ARCH_HIGHBANK - bool "Calxeda ECX-1000 (Highbank)" if ARCH_MULTI_V7 + bool "Calxeda ECX-1000/2000 (Highbank/Midway)" if ARCH_MULTI_V7 select ARCH_WANT_OPTIONAL_GPIOLIB select ARM_AMBA select ARM_GIC 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 @@ #include <linux/smp.h> #include <linux/amba/bus.h> +#include <asm/arch_timer.h> #include <asm/cacheflush.h> #include <asm/smp_plat.h> #include <asm/smp_twd.h> @@ -70,6 +71,7 @@ void highbank_set_cpu_jump(int cpu, void *jump_addr) } const static struct of_device_id irq_match[] = { + { .compatible = "arm,cortex-a15-gic", .data = gic_of_init, }, { .compatible = "arm,cortex-a9-gic", .data = gic_of_init, }, {} }; @@ -126,6 +128,9 @@ static void __init highbank_timer_init(void) sp804_clockevents_init(timer_base, irq, "timer0"); twd_local_timer_of_register(); + + arch_timer_of_register(); + arch_timer_sched_clock_init(); } static struct sys_timer highbank_timer = { @@ -200,6 +205,7 @@ static void __init highbank_init(void) static const char *highbank_match[] __initconst = { "calxeda,highbank", + "calxeda,ecx-2000", NULL, }; |