refresh patches so they apply cleanly
SVN-Revision: 33406
This commit is contained in:
parent
6bc394d90f
commit
39ddc9105c
|
@ -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)));
|
||||
|
|
|
@ -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)));
|
||||
|
|
Loading…
Reference in New Issue