From: Florian Fainelli Date: Fri, 14 Sep 2012 15:37:12 +0000 (+0000) Subject: refresh patches so they apply cleanly X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=39ddc9105c8337c331555a2258559f7a0e9b9b81;p=librecmc%2Flibrecmc.git refresh patches so they apply cleanly SVN-Revision: 33406 --- 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 + 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 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 } - 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)));