diff options
| author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-09-14 15:37:12 +0000 |
|---|---|---|
| committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-09-14 15:37:12 +0000 |
| commit | d88f9818d8ccbcacc74c27a06b08c33f342879de (patch) | |
| tree | 1c8df0fe59b2c3eb49cd4a6eee5cfc7e400df60f | |
| parent | f1b8b6700c54143b44be3a267cd022e3dc035955 (diff) | |
[leon] refresh patches so they apply cleanly
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33406 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -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 035543db6..18d7f8bea 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 cd31da265..d8d436347 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))); |