aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/leon/patches/007-amp_timer.patch
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
commit39ddc9105c8337c331555a2258559f7a0e9b9b81 (patch)
treeacc9a80422071b4e3b179f088988729e3bca3316 /target/linux/leon/patches/007-amp_timer.patch
parent6bc394d90f3667a5cd6b1aa9ebeb0b167a10cfa4 (diff)
downloadupstream-39ddc9105c8337c331555a2258559f7a0e9b9b81.tar.gz
upstream-39ddc9105c8337c331555a2258559f7a0e9b9b81.tar.bz2
upstream-39ddc9105c8337c331555a2258559f7a0e9b9b81.zip
refresh patches so they apply cleanly
SVN-Revision: 33406
Diffstat (limited to 'target/linux/leon/patches/007-amp_timer.patch')
-rw-r--r--target/linux/leon/patches/007-amp_timer.patch7
1 files changed, 4 insertions, 3 deletions
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)));