target/linux/ramips/patches-3.14/0017-MIPS-use-set_mode-to-enable-disable-the-cevt-r4k-irq.patch

   1 From f8da5caf65926d44581d4e7914b28ceab3d28a7c Mon Sep 17 00:00:00 2001
   2 From: John Crispin <blogic@openwrt.org>
   3 Date: Sun, 14 Jul 2013 23:08:11 +0200
   4 Subject: [PATCH 17/57] MIPS: use set_mode() to enable/disable the cevt-r4k
   5  irq
   6
   7 Signed-off-by: John Crispin <blogic@openwrt.org>
   8 ---
   9  arch/mips/kernel/cevt-r4k.c |   37 +++++++++++++++++++++++++++++++------
  10  1 file changed, 31 insertions(+), 6 deletions(-)
  11
  12 diff --git a/arch/mips/kernel/cevt-r4k.c b/arch/mips/kernel/cevt-r4k.c
  13 index 50d3f5a..99585e6 100644
  14 --- a/arch/mips/kernel/cevt-r4k.c
  15 +++ b/arch/mips/kernel/cevt-r4k.c
  16 @@ -38,12 +38,6 @@ static int mips_next_event(unsigned long delta,
  17
  18  #endif /* CONFIG_MIPS_MT_SMTC */
  19
  20 -void mips_set_clock_mode(enum clock_event_mode mode,
  21 -                               struct clock_event_device *evt)
  22 -{
  23 -       /* Nothing to do ...  */
  24 -}
  25 -
  26  DEFINE_PER_CPU(struct clock_event_device, mips_clockevent_device);
  27  int cp0_timer_irq_installed;
  28
  29 @@ -90,9 +84,38 @@ struct irqaction c0_compare_irqaction = {
  30         .name = "timer",
  31  };
  32
  33 +void mips_set_clock_mode(enum clock_event_mode mode,
  34 +                               struct clock_event_device *evt)
  35 +{
  36 +#ifdef CONFIG_CEVT_SYSTICK_QUIRK
  37 +       switch (mode) {
  38 +       case CLOCK_EVT_MODE_ONESHOT:
  39 +               if (cp0_timer_irq_installed)
  40 +                       break;
  41 +
  42 +               cp0_timer_irq_installed = 1;
  43 +
  44 +               setup_irq(evt->irq, &c0_compare_irqaction);
  45 +               break;
  46 +
  47 +       case CLOCK_EVT_MODE_SHUTDOWN:
  48 +               if (!cp0_timer_irq_installed)
  49 +                       break;
  50 +
  51 +               cp0_timer_irq_installed = 0;
  52 +               free_irq(evt->irq, &c0_compare_irqaction);
  53 +               break;
  54 +
  55 +       default:
  56 +               pr_err("Unhandeled mips clock_mode\n");
  57 +               break;
  58 +       }
  59 +#endif
  60 +}
  61
  62  void mips_event_handler(struct clock_event_device *dev)
  63  {
  64 +
  65  }
  66
  67  /*
  68 @@ -215,12 +238,14 @@ int r4k_clockevent_init(void)
  69  #endif
  70         clockevents_register_device(cd);
  71
  72 +#ifndef CONFIG_CEVT_SYSTICK_QUIRK
  73         if (cp0_timer_irq_installed)
  74                 return 0;
  75
  76         cp0_timer_irq_installed = 1;
  77
  78         setup_irq(irq, &c0_compare_irqaction);
  79 +#endif
  80
  81         return 0;
  82  }
  83 --
  84 1.7.10.4
  85