diff options
| author | John Crispin <john@openwrt.org> | 2015-04-10 08:27:44 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2015-04-10 08:27:44 +0000 |
| commit | 607a7a35be830a684ab9349d5a3c979a2d4f439a (patch) | |
| tree | 79a8e80b9256c8d4dca4e86c4f4531aa84630b38 /target/linux/ramips | |
| parent | 19b239d64343f3f5451d0a6cb7c4fe19b2f8bcf7 (diff) | |
| download | upstream-607a7a35be830a684ab9349d5a3c979a2d4f439a.tar.gz upstream-607a7a35be830a684ab9349d5a3c979a2d4f439a.tar.bz2 upstream-607a7a35be830a684ab9349d5a3c979a2d4f439a.zip | |
ralink: fix cevt-r4k hack
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 45342
Diffstat (limited to 'target/linux/ramips')
| -rw-r--r-- | target/linux/ramips/patches-3.18/0017-MIPS-use-set_mode-to-enable-disable-the-cevt-r4k-irq.patch | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/target/linux/ramips/patches-3.18/0017-MIPS-use-set_mode-to-enable-disable-the-cevt-r4k-irq.patch b/target/linux/ramips/patches-3.18/0017-MIPS-use-set_mode-to-enable-disable-the-cevt-r4k-irq.patch index 4e3d962e86..955550a422 100644 --- a/target/linux/ramips/patches-3.18/0017-MIPS-use-set_mode-to-enable-disable-the-cevt-r4k-irq.patch +++ b/target/linux/ramips/patches-3.18/0017-MIPS-use-set_mode-to-enable-disable-the-cevt-r4k-irq.patch @@ -11,7 +11,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> --- a/arch/mips/kernel/cevt-r4k.c +++ b/arch/mips/kernel/cevt-r4k.c -@@ -29,12 +29,6 @@ static int mips_next_event(unsigned long +@@ -29,12 +29,6 @@ return res; } @@ -24,7 +24,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> DEFINE_PER_CPU(struct clock_event_device, mips_clockevent_device); int cp0_timer_irq_installed; -@@ -75,9 +69,38 @@ struct irqaction c0_compare_irqaction = +@@ -75,9 +69,38 @@ .name = "timer", }; @@ -63,7 +63,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> } /* -@@ -198,12 +221,14 @@ int r4k_clockevent_init(void) +@@ -198,12 +221,14 @@ clockevents_register_device(cd); @@ -78,3 +78,22 @@ Signed-off-by: John Crispin <blogic@openwrt.org> return 0; } +--- a/arch/mips/ralink/Kconfig ++++ b/arch/mips/ralink/Kconfig +@@ -1,11 +1,16 @@ + if RALINK + ++config CEVT_SYSTICK_QUIRK ++ bool ++ default n ++ + config CLKEVT_RT3352 + bool + depends on SOC_RT305X || SOC_MT7620 + default y + select CLKSRC_OF + select CLKSRC_MMIO ++ select CEVT_SYSTICK_QUIRK + + config IRQ_INTC + bool |