Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / arch / mips / jz4740 / time.c

diff --git a/arch/mips/jz4740/time.c b/arch/mips/jz4740/time.c
index be9b0a3a5c405dede68f1451f91025d4a4f2de94..7ab47fee1be8fdf24ae76dd3a0787221890eaa10 100644 (file)
--- a/arch/mips/jz4740/time.c
+++ b/arch/mips/jz4740/time.c
@@ -102,7 +102,12 @@ static struct clock_event_device jz4740_clockevent = {
        .set_next_event = jz4740_clockevent_set_next,
        .set_mode = jz4740_clockevent_set_mode,
        .rating = 200,
+#ifdef CONFIG_MACH_JZ4740
        .irq = JZ4740_IRQ_TCU0,
+#endif
+#ifdef CONFIG_MACH_JZ4780
+       .irq = JZ4780_IRQ_TCU2,
+#endif
 };
 
 static struct irqaction timer_irqaction = {
@@ -120,7 +125,6 @@ void __init plat_time_init(void)
        struct clk *ext_clk;
 
        of_clk_init(NULL);
-       jz4740_clock_init();
        jz4740_timer_init();
 
        ext_clk = clk_get(NULL, "ext");
@@ -145,7 +149,7 @@ void __init plat_time_init(void)
 
        sched_clock_register(jz4740_read_sched_clock, 16, clk_rate);
 
-       setup_irq(JZ4740_IRQ_TCU0, &timer_irqaction);
+       setup_irq(jz4740_clockevent.irq, &timer_irqaction);
 
        ctrl = JZ_TIMER_CTRL_PRESCALE_16 | JZ_TIMER_CTRL_SRC_EXT;