aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips/patches-4.3/0014-arch-mips-cleanup-cevt-rt3352.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/ramips/patches-4.3/0014-arch-mips-cleanup-cevt-rt3352.patch')
-rw-r--r--target/linux/ramips/patches-4.3/0014-arch-mips-cleanup-cevt-rt3352.patch21
1 files changed, 8 insertions, 13 deletions
diff --git a/target/linux/ramips/patches-4.3/0014-arch-mips-cleanup-cevt-rt3352.patch b/target/linux/ramips/patches-4.3/0014-arch-mips-cleanup-cevt-rt3352.patch
index d6410505c7..50b3dc8318 100644
--- a/target/linux/ramips/patches-4.3/0014-arch-mips-cleanup-cevt-rt3352.patch
+++ b/target/linux/ramips/patches-4.3/0014-arch-mips-cleanup-cevt-rt3352.patch
@@ -8,11 +8,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
arch/mips/ralink/cevt-rt3352.c | 85 ++++++++++++++++++++++++++--------------
1 file changed, 56 insertions(+), 29 deletions(-)
-diff --git a/arch/mips/ralink/cevt-rt3352.c b/arch/mips/ralink/cevt-rt3352.c
-index cecf44f..424635c 100644
--- a/arch/mips/ralink/cevt-rt3352.c
+++ b/arch/mips/ralink/cevt-rt3352.c
-@@ -52,7 +52,7 @@ static inline void mt7620_freq_scaling(struct systick_device *sdev, int status)
+@@ -52,7 +52,7 @@ static inline void mt7620_freq_scaling(s
sdev->freq_scale = status;
@@ -21,7 +19,7 @@ index cecf44f..424635c 100644
(status) ? ("enable") : ("disable"));
if (status)
rt_sysc_w32(rt_sysc_r32(CLK_LUT_CFG) | SLEEP_EN, CLK_LUT_CFG);
-@@ -60,18 +60,33 @@ static inline void mt7620_freq_scaling(struct systick_device *sdev, int status)
+@@ -60,18 +60,33 @@ static inline void mt7620_freq_scaling(s
rt_sysc_w32(rt_sysc_r32(CLK_LUT_CFG) & ~SLEEP_EN, CLK_LUT_CFG);
}
@@ -60,7 +58,7 @@ index cecf44f..424635c 100644
}
static void systick_event_handler(struct clock_event_device *dev)
-@@ -81,20 +96,25 @@ static void systick_event_handler(struct clock_event_device *dev)
+@@ -81,20 +96,25 @@ static void systick_event_handler(struct
static irqreturn_t systick_interrupt(int irq, void *dev_id)
{
@@ -68,12 +66,12 @@ index cecf44f..424635c 100644
+ int ret = 0;
+ struct clock_event_device *cdev;
+ struct systick_device *sdev;
-+
+
+- dev->event_handler(dev);
+ if (read_c0_cause() & STATUSF_IP7) {
+ cdev = (struct clock_event_device *) dev_id;
+ sdev = container_of(cdev, struct systick_device, dev);
-
-- dev->event_handler(dev);
++
+ /* Clear Count/Compare Interrupt */
+ write_compare(sdev, read_compare(sdev));
+ cdev->event_handler(cdev);
@@ -94,7 +92,7 @@ index cecf44f..424635c 100644
.features = CLOCK_EVT_FEAT_ONESHOT,
.set_next_event = systick_next_event,
.set_state_shutdown = systick_shutdown,
-@@ -116,9 +136,9 @@ static int systick_shutdown(struct clock_event_device *evt)
+@@ -116,9 +136,9 @@ static int systick_shutdown(struct clock
sdev = container_of(evt, struct systick_device, dev);
if (sdev->irq_requested)
@@ -106,7 +104,7 @@ index cecf44f..424635c 100644
if (systick_freq_scaling)
systick_freq_scaling(sdev, 0);
-@@ -145,38 +165,45 @@ static int systick_set_oneshot(struct clock_event_device *evt)
+@@ -145,38 +165,45 @@ static int systick_set_oneshot(struct cl
}
static const struct of_device_id systick_match[] = {
@@ -165,6 +163,3 @@ index cecf44f..424635c 100644
pr_info("%s: running - mult: %d, shift: %d\n",
np->name, systick.dev.mult, systick.dev.shift);
}
---
-1.7.10.4
-