aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/leon
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-09-14 15:37:12 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-09-14 15:37:12 +0000
commit86cc1ae305f481f697186f7aa2da50f9ae511e60 (patch)
tree1c8df0fe59b2c3eb49cd4a6eee5cfc7e400df60f /target/linux/leon
parentda01601116f270a12de3177c0ae63ab21a84e5e4 (diff)
downloadupstream-86cc1ae305f481f697186f7aa2da50f9ae511e60.tar.gz
upstream-86cc1ae305f481f697186f7aa2da50f9ae511e60.tar.bz2
upstream-86cc1ae305f481f697186f7aa2da50f9ae511e60.zip
[leon] refresh patches so they apply cleanly
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33406 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/leon')
-rw-r--r--target/linux/leon/patches/001-find_irq_and_timer_via_of.patch2
-rw-r--r--target/linux/leon/patches/007-amp_timer.patch7
2 files changed, 5 insertions, 4 deletions
diff --git a/target/linux/leon/patches/001-find_irq_and_timer_via_of.patch b/target/linux/leon/patches/001-find_irq_and_timer_via_of.patch
index 035543db6d..18d7f8beac 100644
--- a/target/linux/leon/patches/001-find_irq_and_timer_via_of.patch
+++ b/target/linux/leon/patches/001-find_irq_and_timer_via_of.patch
@@ -45,4 +45,4 @@ Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
+ if (leon3_gptimer_regs && leon3_irqctrl_regs && leon3_gptimer_irq) {
LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[0].val, 0);
LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[0].rld,
- (((1000000 / 100) - 1)));
+ (((1000000 / HZ) - 1)));
diff --git a/target/linux/leon/patches/007-amp_timer.patch b/target/linux/leon/patches/007-amp_timer.patch
index cd31da2653..d8d436347f 100644
--- a/target/linux/leon/patches/007-amp_timer.patch
+++ b/target/linux/leon/patches/007-amp_timer.patch
@@ -66,10 +66,11 @@ Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
if (leon3_gptimer_regs && leon3_irqctrl_regs && leon3_gptimer_irq) {
- LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[0].val, 0);
- LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[0].rld,
+- (((1000000 / HZ) - 1)));
+- LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[0].ctrl, 0);
+ LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[leon3_gptimer_idx].val, 0);
+ LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[leon3_gptimer_idx].rld,
- (((1000000 / 100) - 1)));
-- LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[0].ctrl, 0);
++ (((1000000 / 100) - 1)));
+ LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[leon3_gptimer_idx].ctrl, 0);
#ifdef CONFIG_SMP
@@ -84,7 +85,7 @@ Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
}
- LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[1].val, 0);
-- LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[1].rld, (((1000000/100) - 1)));
+- LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[1].rld, (((1000000/HZ) - 1)));
- LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[1].ctrl, 0);
+ LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[leon3_gptimer_idx+1].val, 0);
+ LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[leon3_gptimer_idx+1].rld, (((1000000/100) - 1)));