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

   1 From b9afea3f5cf6c2da3b88f2902c4377e9c5b22a6d Mon Sep 17 00:00:00 2001
   2 From: John Crispin <blogic@openwrt.org>
   3 Date: Fri, 3 May 2013 00:04:58 +0200
   4 Subject: [PATCH 52/79] 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 |   39 ++++++++++++++++++++++++++-------------
  10  1 file changed, 26 insertions(+), 13 deletions(-)
  11
  12 diff --git a/arch/mips/kernel/cevt-r4k.c b/arch/mips/kernel/cevt-r4k.c
  13 index 7532392..afc08e4 100644
  14 --- a/arch/mips/kernel/cevt-r4k.c
  15 +++ b/arch/mips/kernel/cevt-r4k.c
  16 @@ -39,12 +39,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 @@ -89,6 +83,32 @@ 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 +       switch (mode) {
  37 +       case CLOCK_EVT_MODE_ONESHOT:
  38 +               if (cp0_timer_irq_installed)
  39 +                       break;
  40 +
  41 +               cp0_timer_irq_installed = 1;
  42 +
  43 +               setup_irq(evt->irq, &c0_compare_irqaction);
  44 +               break;
  45 +
  46 +       case CLOCK_EVT_MODE_SHUTDOWN:
  47 +               if (!cp0_timer_irq_installed)
  48 +                       break;
  49 +
  50 +               cp0_timer_irq_installed = 0;
  51 +               free_irq(evt->irq, &c0_compare_irqaction);
  52 +               break;
  53 +
  54 +       default:
  55 +               pr_err("Unhandeled mips clock_mode\n");
  56 +               break;
  57 +       }
  58 +}
  59
  60  void mips_event_handler(struct clock_event_device *dev)
  61  {
  62 @@ -208,13 +228,6 @@ int __cpuinit r4k_clockevent_init(void)
  63
  64         clockevents_register_device(cd);
  65
  66 -       if (cp0_timer_irq_installed)
  67 -               return 0;
  68 -
  69 -       cp0_timer_irq_installed = 1;
  70 -
  71 -       setup_irq(irq, &c0_compare_irqaction);
  72 -
  73         return 0;
  74  }
  75
  76 --
  77 1.7.10.4
  78