diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-24 21:57:45 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-24 21:57:45 +0100 |
commit | 756fe285070feb254a770cefc5640fe005ea9c27 (patch) | |
tree | c391c039bc8ef7ec6958017413aba250210e9af6 /arch/arm/mach-w90x900/include/mach | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp (diff) | |
parent | VIDEO: cyberpro: pci_request_regions needs a persistent name (diff) | |
download | linux-756fe285070feb254a770cefc5640fe005ea9c27.tar.xz linux-756fe285070feb254a770cefc5640fe005ea9c27.zip |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
VIDEO: cyberpro: pci_request_regions needs a persistent name
ARM: dma-isa: request cascade channel after registering it
ARM: footbridge: trim down old ISA rtc setup
ARM: fix PAGE_KERNEL
ARM: Fix wrong shared bit for CPU write buffer bug test
ARM: 5857/1: ARM: dmabounce: fix build
ARM: 5856/1: Fix bug of uart0 platfrom data for nuc900
ARM: 5855/1: putc support for nuc900
ARM: 5854/1: fix compiling error for NUC900
ARM: 5849/1: ARMv7: fix Oprofile events count
ARM: add missing include to nwflash.c
ARM: Kill CONFIG_CPU_32
ARM: Convert VFP/Crunch/XscaleCP thread_release() to exit_thread()
ARM: 5853/1: ARM: Fix build break on ARM v6 and v7
Diffstat (limited to 'arch/arm/mach-w90x900/include/mach')
-rw-r--r-- | arch/arm/mach-w90x900/include/mach/uncompress.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-w90x900/include/mach/uncompress.h b/arch/arm/mach-w90x900/include/mach/uncompress.h index 050d9fe5ae1b..56f1a74d7016 100644 --- a/arch/arm/mach-w90x900/include/mach/uncompress.h +++ b/arch/arm/mach-w90x900/include/mach/uncompress.h @@ -22,11 +22,21 @@ #include <mach/regs-serial.h> #include <mach/map.h> +#include <linux/serial_reg.h> #define arch_decomp_wdog() +#define TX_DONE (UART_LSR_TEMT | UART_LSR_THRE) +static volatile u32 * uart_base = (u32 *)UART0_PA; + static void putc(int ch) { + /* Check THRE and TEMT bits before we transmit the character. + */ + while ((uart_base[UART_LSR] & TX_DONE) != TX_DONE) + barrier(); + + *uart_base = ch; } static inline void flush(void) |