diff options
| author | Florian Fainelli <florian@openwrt.org> | 2012-09-14 15:37:12 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2012-09-14 15:37:12 +0000 |
| commit | 39ddc9105c8337c331555a2258559f7a0e9b9b81 (patch) | |
| tree | acc9a80422071b4e3b179f088988729e3bca3316 /target | |
| parent | 6bc394d90f3667a5cd6b1aa9ebeb0b167a10cfa4 (diff) | |
| download | upstream-39ddc9105c8337c331555a2258559f7a0e9b9b81.tar.gz upstream-39ddc9105c8337c331555a2258559f7a0e9b9b81.tar.bz2 upstream-39ddc9105c8337c331555a2258559f7a0e9b9b81.zip | |
refresh patches so they apply cleanly
SVN-Revision: 33406
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/leon/patches/001-find_irq_and_timer_via_of.patch | 2 | ||||
| -rw-r--r-- | target/linux/leon/patches/007-amp_timer.patch | 7 |
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))); |