diff options
| author | Haojian Zhuang <haojian.zhuang@linaro.org> | 2013-05-02 13:52:14 +0800 |
|---|---|---|
| committer | Zhangfei Gao <zhangfei.gao@linaro.org> | 2013-08-13 14:33:08 +0800 |
| commit | cd6bef4539801d763547fccbd67148a7a54a6dc6 (patch) | |
| tree | 4a6526832e2b1766f678d900088f39f5e4339934 | |
| parent | d2e13a450a1bd50db3ea13f8a0277dddd43e8a37 (diff) | |
ARM: hs: update gic and timer in mach hs
Since gic is updated in 3.9, update the initialization gic & timer
interface in hs-dt.c
Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
Conflicts:
arch/arm/mach-hs/hs-dt.c
| -rw-r--r-- | arch/arm/mach-hs/hs-dt.c | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/arch/arm/mach-hs/hs-dt.c b/arch/arm/mach-hs/hs-dt.c index 5d7f218b8842..905369cef8db 100644 --- a/arch/arm/mach-hs/hs-dt.c +++ b/arch/arm/mach-hs/hs-dt.c @@ -13,12 +13,12 @@ #include <linux/clk.h> #include <linux/clkdev.h> #include <linux/clk-provider.h> +#include <linux/irqchip.h> #include <linux/of_address.h> #include <linux/of_irq.h> #include <linux/of_platform.h> #include <asm/hardware/arm_timer.h> -#include <asm/hardware/gic.h> #include <asm/hardware/timer-sp.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> @@ -59,22 +59,9 @@ static void __init hs_timer_init(void) sp804_lookup.clk = of_clk_get(node, 0); clkdev_add(&sp804_lookup); - sp804_clocksource_and_sched_clock_init(base + TIMER_2_BASE, "timer1"); - sp804_clockevents_init(base, irq, "timer0"); -} - -static struct sys_timer hs_timer = { - .init = hs_timer_init, -}; - -static struct of_device_id hs_irq_match[] __initdata = { - { .compatible = "arm,cortex-a9-gic", .data = gic_of_init, }, - {} -}; - -static void __init hs_irq_init(void) -{ - of_irq_init(hs_irq_match); + __sp804_clocksource_and_sched_clock_init(base + TIMER_2_BASE, "timer1", + sp804_lookup.clk, 1); + __sp804_clockevents_init(base, irq, sp804_lookup.clk, "timer0"); } static void __init hs_init(void) @@ -90,9 +77,8 @@ static const char *hs_compat[] __initdata = { DT_MACHINE_START(HS_DT, "Hisilicon Hi36xx/Hi37xx (Flattened Device Tree)") /* Maintainer: Haojian Zhuang <haojian.zhuang@linaro.org> */ .map_io = debug_ll_io_init, - .init_irq = hs_irq_init, - .timer = &hs_timer, + .init_irq = irqchip_init, + .init_time = hs_timer_init, .init_machine = hs_init, - .handle_irq = gic_handle_irq, .dt_compat = hs_compat, MACHINE_END |