1 From 4977695198a8daf06746cb6c499d754040b6d0ac 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 136/164] MIPS: use set_mode() to enable/disable the cevt-r4k
7 Signed-off-by: John Crispin <blogic@openwrt.org>
9 arch/mips/kernel/cevt-r4k.c | 39 ++++++++++++++++++++++++++-------------
10 1 file changed, 26 insertions(+), 13 deletions(-)
12 diff --git a/arch/mips/kernel/cevt-r4k.c b/arch/mips/kernel/cevt-r4k.c
13 index 07b847d..d5d94e5 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,
18 #endif /* CONFIG_MIPS_MT_SMTC */
20 -void mips_set_clock_mode(enum clock_event_mode mode,
21 - struct clock_event_device *evt)
23 - /* Nothing to do ... */
26 DEFINE_PER_CPU(struct clock_event_device, mips_clockevent_device);
27 int cp0_timer_irq_installed;
29 @@ -89,6 +83,32 @@ struct irqaction c0_compare_irqaction = {
33 +void mips_set_clock_mode(enum clock_event_mode mode,
34 + struct clock_event_device *evt)
37 + case CLOCK_EVT_MODE_ONESHOT:
38 + if (cp0_timer_irq_installed)
41 + cp0_timer_irq_installed = 1;
43 + setup_irq(evt->irq, &c0_compare_irqaction);
46 + case CLOCK_EVT_MODE_SHUTDOWN:
47 + if (!cp0_timer_irq_installed)
50 + cp0_timer_irq_installed = 0;
51 + free_irq(evt->irq, &c0_compare_irqaction);
55 + pr_err("Unhandeled mips clock_mode\n");
60 void mips_event_handler(struct clock_event_device *dev)
62 @@ -208,13 +228,6 @@ int __cpuinit r4k_clockevent_init(void)
64 clockevents_register_device(cd);
66 - if (cp0_timer_irq_installed)
69 - cp0_timer_irq_installed = 1;
71 - setup_irq(irq, &c0_compare_irqaction);