Merge tag 'md/3.19' of git://neil.brown.name/md

[cascardo/linux.git] / arch / mips / mti-sead3 / sead3-time.c

diff --git a/arch/mips/mti-sead3/sead3-time.c b/arch/mips/mti-sead3/sead3-time.c
index 678d03d..ec1dd24 100644 (file)
--- a/arch/mips/mti-sead3/sead3-time.c
+++ b/arch/mips/mti-sead3/sead3-time.c
@@ -6,6 +6,7 @@
  * Copyright (C) 2012 MIPS Technologies, Inc.  All rights reserved.
  */
 #include <linux/init.h>
+#include <linux/irqchip/mips-gic.h>
 
 #include <asm/cpu.h>
 #include <asm/setup.h>
@@ -13,19 +14,6 @@
 #include <asm/irq.h>
 #include <asm/mips-boards/generic.h>
 
-static int mips_cpu_timer_irq;
-static int mips_cpu_perf_irq;
-
-static void mips_timer_dispatch(void)
-{
-       do_IRQ(mips_cpu_timer_irq);
-}
-
-static void mips_perf_dispatch(void)
-{
-       do_IRQ(mips_cpu_perf_irq);
-}
-
 static void __iomem *status_reg = (void __iomem *)0xbf000410;
 
 /*
@@ -81,21 +69,20 @@ void read_persistent_clock(struct timespec *ts)
        ts->tv_nsec = 0;
 }
 
-static void __init plat_perf_setup(void)
+int get_c0_perfcount_int(void)
 {
-       if (cp0_perfcount_irq >= 0) {
-               if (cpu_has_vint)
-                       set_vi_handler(cp0_perfcount_irq, mips_perf_dispatch);
-               mips_cpu_perf_irq = MIPS_CPU_IRQ_BASE + cp0_perfcount_irq;
-       }
+       if (gic_present)
+               return gic_get_c0_compare_int();
+       if (cp0_perfcount_irq >= 0)
+               return MIPS_CPU_IRQ_BASE + cp0_perfcount_irq;
+       return -1;
 }
 
 unsigned int get_c0_compare_int(void)
 {
-       if (cpu_has_vint)
-               set_vi_handler(cp0_compare_irq, mips_timer_dispatch);
-       mips_cpu_timer_irq = MIPS_CPU_IRQ_BASE + cp0_compare_irq;
-       return mips_cpu_timer_irq;
+       if (gic_present)
+               return gic_get_c0_compare_int();
+       return MIPS_CPU_IRQ_BASE + cp0_compare_irq;
 }
 
 void __init plat_time_init(void)
@@ -108,6 +95,4 @@ void __init plat_time_init(void)
                (est_freq % 1000000) * 100 / 1000000);
 
        mips_scroll_message();
-
-       plat_perf_setup();
 }