diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-11-12 05:58:59 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-11-12 05:58:59 -0500 |
| commit | df762eccbadf87850fbee444d729e0f1b1e946f1 (patch) | |
| tree | 1bf47bbbd4ea91e343f983b3b50ec2ec73a739e1 /arch/arm/include/debug/pl01x.S | |
| parent | ec1e20a02fe33b767ffcca8920a32211492416d7 (diff) | |
| parent | 70d42126877b9faa272d446a6de5917614c28dd9 (diff) | |
Merge branch 'devel-stable' into for-next
Conflicts:
arch/arm/include/asm/atomic.h
arch/arm/include/asm/hardirq.h
arch/arm/kernel/smp.c
Diffstat (limited to 'arch/arm/include/debug/pl01x.S')
| -rw-r--r-- | arch/arm/include/debug/pl01x.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/include/debug/pl01x.S b/arch/arm/include/debug/pl01x.S index 37c6895b87e6..92ef808a2337 100644 --- a/arch/arm/include/debug/pl01x.S +++ b/arch/arm/include/debug/pl01x.S | |||
| @@ -25,12 +25,14 @@ | |||
| 25 | 25 | ||
| 26 | .macro waituart,rd,rx | 26 | .macro waituart,rd,rx |
| 27 | 1001: ldr \rd, [\rx, #UART01x_FR] | 27 | 1001: ldr \rd, [\rx, #UART01x_FR] |
| 28 | ARM_BE8( rev \rd, \rd ) | ||
| 28 | tst \rd, #UART01x_FR_TXFF | 29 | tst \rd, #UART01x_FR_TXFF |
| 29 | bne 1001b | 30 | bne 1001b |
| 30 | .endm | 31 | .endm |
| 31 | 32 | ||
| 32 | .macro busyuart,rd,rx | 33 | .macro busyuart,rd,rx |
| 33 | 1001: ldr \rd, [\rx, #UART01x_FR] | 34 | 1001: ldr \rd, [\rx, #UART01x_FR] |
| 35 | ARM_BE8( rev \rd, \rd ) | ||
| 34 | tst \rd, #UART01x_FR_BUSY | 36 | tst \rd, #UART01x_FR_BUSY |
| 35 | bne 1001b | 37 | bne 1001b |
| 36 | .endm | 38 | .endm |