diff options
| author | Andrew Victor <andrew@sanpeople.com> | 2007-02-08 03:00:39 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-02-08 09:55:22 -0500 |
| commit | d0760b3bc8ff9b34e3e2e166e2102548a24751b4 (patch) | |
| tree | 1ff9a9acf479b75e2d8dc23f1b894e5ac12c8d1d /include/asm-arm/arch-at91/debug-macro.S | |
| parent | 9d0412680e6c7b685ee466842047bcfb924d6dc5 (diff) | |
[ARM] 4143/1: AT91: Prepare for AT91SAM9263 support
The Atmel AT91SAM9263 processor includes many more integrated
peripherals than Atmel's previous ARM9-based AT91 processors, so this
has necessitated a few changes to the core AT91 support.
These changes are:
* The system peripheral I/O region we remap has increased from
0xFFFA0000..0xFFFFFFFF to 0xFFF78000..0xFFFFFFFF.
* The increased I/O region forces changes to entry-macro.S and
debug-macro.S due to ARM's limited immediate offset addressing
modes.
* Maximum number of GPIO banks increases to 5.
* 2 MMC controllers so the board-setup code needs to specify which
controller it wishes to use when calling at91_add_device_mmc().
Original patch from Nicolas Ferre.
Signed-off-by: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/asm-arm/arch-at91/debug-macro.S')
| -rw-r--r-- | include/asm-arm/arch-at91/debug-macro.S | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/asm-arm/arch-at91/debug-macro.S b/include/asm-arm/arch-at91/debug-macro.S index 20721ef1ed1b..13e9f5e1d4ff 100644 --- a/include/asm-arm/arch-at91/debug-macro.S +++ b/include/asm-arm/arch-at91/debug-macro.S | |||
| @@ -16,24 +16,24 @@ | |||
| 16 | 16 | ||
| 17 | .macro addruart,rx | 17 | .macro addruart,rx |
| 18 | mrc p15, 0, \rx, c1, c0 | 18 | mrc p15, 0, \rx, c1, c0 |
| 19 | tst \rx, #1 @ MMU enabled? | 19 | tst \rx, #1 @ MMU enabled? |
| 20 | ldreq \rx, =AT91_BASE_SYS @ System peripherals (phys address) | 20 | ldreq \rx, =(AT91_BASE_SYS + AT91_DBGU) @ System peripherals (phys address) |
| 21 | ldrne \rx, =AT91_VA_BASE_SYS @ System peripherals (virt address) | 21 | ldrne \rx, =(AT91_VA_BASE_SYS + AT91_DBGU) @ System peripherals (virt address) |
| 22 | .endm | 22 | .endm |
| 23 | 23 | ||
| 24 | .macro senduart,rd,rx | 24 | .macro senduart,rd,rx |
| 25 | strb \rd, [\rx, #AT91_DBGU_THR] @ Write to Transmitter Holding Register | 25 | strb \rd, [\rx, #(AT91_DBGU_THR - AT91_DBGU)] @ Write to Transmitter Holding Register |
| 26 | .endm | 26 | .endm |
| 27 | 27 | ||
| 28 | .macro waituart,rd,rx | 28 | .macro waituart,rd,rx |
| 29 | 1001: ldr \rd, [\rx, #AT91_DBGU_SR] @ Read Status Register | 29 | 1001: ldr \rd, [\rx, #(AT91_DBGU_SR - AT91_DBGU)] @ Read Status Register |
| 30 | tst \rd, #AT91_DBGU_TXRDY @ DBGU_TXRDY = 1 when ready to transmit | 30 | tst \rd, #AT91_DBGU_TXRDY @ DBGU_TXRDY = 1 when ready to transmit |
| 31 | beq 1001b | 31 | beq 1001b |
| 32 | .endm | 32 | .endm |
| 33 | 33 | ||
| 34 | .macro busyuart,rd,rx | 34 | .macro busyuart,rd,rx |
| 35 | 1001: ldr \rd, [\rx, #AT91_DBGU_SR] @ Read Status Register | 35 | 1001: ldr \rd, [\rx, #(AT91_DBGU_SR - AT91_DBGU)] @ Read Status Register |
| 36 | tst \rd, #AT91_DBGU_TXEMPTY @ DBGU_TXEMPTY = 1 when transmission complete | 36 | tst \rd, #AT91_DBGU_TXEMPTY @ DBGU_TXEMPTY = 1 when transmission complete |
| 37 | beq 1001b | 37 | beq 1001b |
| 38 | .endm | 38 | .endm |
| 39 | 39 | ||