Merge git://git.kernel.org/pub/scm/linux/kernel/git/jk/spufs

[linux-2.6] / arch / powerpc / boot / uartlite.c

diff --git a/arch/powerpc/boot/uartlite.c b/arch/powerpc/boot/uartlite.c
index f4249a74c36780b1f2a1b6d596189eb5b3a3c4df..46bed69b416938477a0be06e14051cacf8427694 100644 (file)
--- a/arch/powerpc/boot/uartlite.c
+++ b/arch/powerpc/boot/uartlite.c
@@ -16,30 +16,45 @@
 #include "io.h"
 #include "ops.h"
 
+#define ULITE_RX               0x00
+#define ULITE_TX               0x04
+#define ULITE_STATUS           0x08
+#define ULITE_CONTROL          0x0c
+
+#define ULITE_STATUS_RXVALID   0x01
+#define ULITE_STATUS_TXFULL    0x08
+
+#define ULITE_CONTROL_RST_RX   0x02
+
 static void * reg_base;
 
 static int uartlite_open(void)
 {
        /* Clear the RX FIFO */
-       out_be32(reg_base + 0x0C, 0x2);
+       out_be32(reg_base + ULITE_CONTROL, ULITE_CONTROL_RST_RX);
        return 0;
 }
 
 static void uartlite_putc(unsigned char c)
 {
-       while ((in_be32(reg_base + 0x8) & 0x08) != 0); /* spin */
-       out_be32(reg_base + 0x4, c);
+       u32 reg = ULITE_STATUS_TXFULL;
+       while (reg & ULITE_STATUS_TXFULL) /* spin on TXFULL bit */
+               reg = in_be32(reg_base + ULITE_STATUS);
+       out_be32(reg_base + ULITE_TX, c);
 }
 
 static unsigned char uartlite_getc(void)
 {
-       while ((in_be32(reg_base + 0x8) & 0x01) == 0); /* spin */
-       return in_be32(reg_base);
+       u32 reg = 0;
+       while (!(reg & ULITE_STATUS_RXVALID)) /* spin waiting for RXVALID bit */
+               reg = in_be32(reg_base + ULITE_STATUS);
+       return in_be32(reg_base + ULITE_RX);
 }
 
 static u8 uartlite_tstc(void)
 {
-       return ((in_be32(reg_base + 0x8) & 0x01) != 0);
+       u32 reg = in_be32(reg_base + ULITE_STATUS);
+       return reg & ULITE_STATUS_RXVALID;
 }
 
 int uartlite_console_init(void *devp, struct serial_console_data *scdp)