linux-mips
[Top] [All Lists]

[PATCH] MIPS: add proper set_mode() to cevt-r4k

To: Ralf Baechle <ralf@linux-mips.org>
Subject: [PATCH] MIPS: add proper set_mode() to cevt-r4k
From: John Crispin <blogic@openwrt.org>
Date: Mon, 29 Jul 2013 11:55:43 +0200
Cc: linux-mips@linux-mips.org, John Crispin <blogic@openwrt.org>
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
Original-recipient: rfc822;linux-mips@linux-mips.org
Sender: linux-mips-bounce@linux-mips.org
On ralink SoC a secondary cevt exists, that shares irq 7 with the r4k timer.
For this to work, we first need to teach cevt-r4k to not hog the irq.

Signed-off-by: John Crispin <blogic@openwrt.org>
---
 arch/mips/kernel/cevt-r4k.c |   39 ++++++++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/arch/mips/kernel/cevt-r4k.c b/arch/mips/kernel/cevt-r4k.c
index 50d3f5a..b726422 100644
--- a/arch/mips/kernel/cevt-r4k.c
+++ b/arch/mips/kernel/cevt-r4k.c
@@ -38,12 +38,6 @@ static int mips_next_event(unsigned long delta,
 
 #endif /* CONFIG_MIPS_MT_SMTC */
 
-void mips_set_clock_mode(enum clock_event_mode mode,
-                               struct clock_event_device *evt)
-{
-       /* Nothing to do ...  */
-}
-
 DEFINE_PER_CPU(struct clock_event_device, mips_clockevent_device);
 int cp0_timer_irq_installed;
 
@@ -90,6 +84,32 @@ struct irqaction c0_compare_irqaction = {
        .name = "timer",
 };
 
+void mips_set_clock_mode(enum clock_event_mode mode,
+                               struct clock_event_device *evt)
+{
+       switch (mode) {
+       case CLOCK_EVT_MODE_ONESHOT:
+               if (cp0_timer_irq_installed)
+                       break;
+
+               cp0_timer_irq_installed = 1;
+
+               setup_irq(evt->irq, &c0_compare_irqaction);
+               break;
+
+       case CLOCK_EVT_MODE_SHUTDOWN:
+               if (!cp0_timer_irq_installed)
+                       break;
+
+               cp0_timer_irq_installed = 0;
+               free_irq(evt->irq, &c0_compare_irqaction);
+               break;
+
+       default:
+               pr_err("Unhandeled mips clock_mode\n");
+               break;
+       }
+}
 
 void mips_event_handler(struct clock_event_device *dev)
 {
@@ -215,13 +235,6 @@ int r4k_clockevent_init(void)
 #endif
        clockevents_register_device(cd);
 
-       if (cp0_timer_irq_installed)
-               return 0;
-
-       cp0_timer_irq_installed = 1;
-
-       setup_irq(irq, &c0_compare_irqaction);
-
        return 0;
 }
 
-- 
1.7.10.4


<Prev in Thread] Current Thread [Next in Thread>