projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MIPS: allow R4K clockevent device to function regardless of GIC
[firefly-linux-kernel-4.4.55.git]
/
arch
/
mips
/
kernel
/
cevt-r4k.c
diff --git
a/arch/mips/kernel/cevt-r4k.c
b/arch/mips/kernel/cevt-r4k.c
index 50d3f5a8d6bb1a9657ec9baa5ccd6852734ad6cf..4dcd1fb5c41dd12279b6e28006660abff232ad03 100644
(file)
--- a/
arch/mips/kernel/cevt-r4k.c
+++ b/
arch/mips/kernel/cevt-r4k.c
@@
-72,9
+72,6
@@
irqreturn_t c0_compare_interrupt(int irq, void *dev_id)
/* Clear Count/Compare Interrupt */
write_c0_compare(read_c0_compare());
cd = &per_cpu(mips_clockevent_device, cpu);
/* Clear Count/Compare Interrupt */
write_c0_compare(read_c0_compare());
cd = &per_cpu(mips_clockevent_device, cpu);
-#ifdef CONFIG_CEVT_GIC
- if (!gic_present)
-#endif
cd->event_handler(cd);
}
cd->event_handler(cd);
}
@@
-195,7
+192,9
@@
int r4k_clockevent_init(void)
cd = &per_cpu(mips_clockevent_device, cpu);
cd->name = "MIPS";
cd = &per_cpu(mips_clockevent_device, cpu);
cd->name = "MIPS";
- cd->features = CLOCK_EVT_FEAT_ONESHOT;
+ cd->features = CLOCK_EVT_FEAT_ONESHOT |
+ CLOCK_EVT_FEAT_C3STOP |
+ CLOCK_EVT_FEAT_PERCPU;
clockevent_set_clock(cd, mips_hpt_frequency);
clockevent_set_clock(cd, mips_hpt_frequency);
@@
-210,9
+209,6
@@
int r4k_clockevent_init(void)
cd->set_mode = mips_set_clock_mode;
cd->event_handler = mips_event_handler;
cd->set_mode = mips_set_clock_mode;
cd->event_handler = mips_event_handler;
-#ifdef CONFIG_CEVT_GIC
- if (!gic_present)
-#endif
clockevents_register_device(cd);
if (cp0_timer_irq_installed)
clockevents_register_device(cd);
if (cp0_timer_irq_installed)