diff options
Diffstat (limited to 'arch/arm/mach-shark')
| -rw-r--r-- | arch/arm/mach-shark/include/mach/entry-macro.S | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-shark/include/mach/entry-macro.S b/arch/arm/mach-shark/include/mach/entry-macro.S index e2853c0a3333..0bb6cc626eb7 100644 --- a/arch/arm/mach-shark/include/mach/entry-macro.S +++ b/arch/arm/mach-shark/include/mach/entry-macro.S | |||
| @@ -11,17 +11,17 @@ | |||
| 11 | .endm | 11 | .endm |
| 12 | 12 | ||
| 13 | .macro get_irqnr_preamble, base, tmp | 13 | .macro get_irqnr_preamble, base, tmp |
| 14 | mov \base, #0xe0000000 | ||
| 14 | .endm | 15 | .endm |
| 15 | 16 | ||
| 16 | .macro arch_ret_to_user, tmp1, tmp2 | 17 | .macro arch_ret_to_user, tmp1, tmp2 |
| 17 | .endm | 18 | .endm |
| 18 | 19 | ||
| 19 | .macro get_irqnr_and_base, irqnr, irqstat, base, tmp | 20 | .macro get_irqnr_and_base, irqnr, irqstat, base, tmp |
| 20 | mov r4, #0xe0000000 | ||
| 21 | 21 | ||
| 22 | mov \irqstat, #0x0C | 22 | mov \irqstat, #0x0C |
| 23 | strb \irqstat, [r4, #0x20] @outb(0x0C, 0x20) /* Poll command */ | 23 | strb \irqstat, [\base, #0x20] @outb(0x0C, 0x20) /* Poll command */ |
| 24 | ldrb \irqnr, [r4, #0x20] @irq = inb(0x20) & 7 | 24 | ldrb \irqnr, [\base, #0x20] @irq = inb(0x20) & 7 |
| 25 | and \irqstat, \irqnr, #0x80 | 25 | and \irqstat, \irqnr, #0x80 |
| 26 | teq \irqstat, #0 | 26 | teq \irqstat, #0 |
| 27 | beq 43f | 27 | beq 43f |
| @@ -29,8 +29,8 @@ | |||
| 29 | teq \irqnr, #2 | 29 | teq \irqnr, #2 |
| 30 | bne 44f | 30 | bne 44f |
| 31 | 43: mov \irqstat, #0x0C | 31 | 43: mov \irqstat, #0x0C |
| 32 | strb \irqstat, [r4, #0xa0] @outb(0x0C, 0xA0) /* Poll command */ | 32 | strb \irqstat, [\base, #0xa0] @outb(0x0C, 0xA0) /* Poll command */ |
| 33 | ldrb \irqnr, [r4, #0xa0] @irq = (inb(0xA0) & 7) + 8 | 33 | ldrb \irqnr, [\base, #0xa0] @irq = (inb(0xA0) & 7) + 8 |
| 34 | and \irqstat, \irqnr, #0x80 | 34 | and \irqstat, \irqnr, #0x80 |
| 35 | teq \irqstat, #0 | 35 | teq \irqstat, #0 |
| 36 | beq 44f | 36 | beq 44f |