aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-arm/arch-iop33x/uncompress.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/asm-arm/arch-iop33x/uncompress.h')
-rw-r--r--include/asm-arm/arch-iop33x/uncompress.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/include/asm-arm/arch-iop33x/uncompress.h b/include/asm-arm/arch-iop33x/uncompress.h
index 62904ae3b038..e17fbc05877b 100644
--- a/include/asm-arm/arch-iop33x/uncompress.h
+++ b/include/asm-arm/arch-iop33x/uncompress.h
@@ -1,6 +1,7 @@
1/* 1/*
2 * linux/include/asm-arm/arch-iop33x/uncompress.h 2 * include/asm-arm/arch-iop33x/uncompress.h
3 */ 3 */
4
4#include <asm/types.h> 5#include <asm/types.h>
5#include <asm/mach-types.h> 6#include <asm/mach-types.h>
6#include <linux/serial_reg.h> 7#include <linux/serial_reg.h>
@@ -8,13 +9,13 @@
8 9
9static volatile u32 *uart_base; 10static volatile u32 *uart_base;
10 11
11#define TX_DONE (UART_LSR_TEMT|UART_LSR_THRE) 12#define TX_DONE (UART_LSR_TEMT | UART_LSR_THRE)
12 13
13static inline void putc(char c) 14static inline void putc(char c)
14{ 15{
15 while ((uart_base[UART_LSR] & TX_DONE) != TX_DONE) 16 while ((uart_base[UART_LSR] & TX_DONE) != TX_DONE)
16 barrier(); 17 barrier();
17 *uart_base = c; 18 uart_base[UART_TX] = c;
18} 19}
19 20
20static inline void flush(void) 21static inline void flush(void)
@@ -24,7 +25,7 @@ static inline void flush(void)
24static __inline__ void __arch_decomp_setup(unsigned long arch_id) 25static __inline__ void __arch_decomp_setup(unsigned long arch_id)
25{ 26{
26 if (machine_is_iq80331() || machine_is_iq80332()) 27 if (machine_is_iq80331() || machine_is_iq80332())
27 uart_base = (volatile u32 *)IOP331_UART0_PHYS; 28 uart_base = (volatile u32 *)IOP33X_UART0_PHYS;
28 else 29 else
29 uart_base = (volatile u32 *)0xfe800000; 30 uart_base = (volatile u32 *)0xfe800000;
30} 31}