Merge branch 'master' of git://git.denx.de/u-boot-blackfin

[u-boot] / drivers / serial / s3c64xx.c

diff --git a/drivers/serial/s3c64xx.c b/drivers/serial/s3c64xx.c
index ea6eb4b34ad74394110f26a596e058697fc9db2e..a88e930945d4928945f6041bdfe61a14c70c0f70 100644 (file)
--- a/drivers/serial/s3c64xx.c
+++ b/drivers/serial/s3c64xx.c
@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * (C) Copyright 2008
  * Guennadi Liakhovetki, DENX Software Engineering, <lg@denx.de>
@@ -23,7 +23,9 @@
 
 #include <common.h>
 
-#include <s3c6400.h>
+#include <asm/arch/s3c6400.h>
+
+DECLARE_GLOBAL_DATA_PTR;
 
 #ifdef CONFIG_SERIAL1
 #define UART_NR        S3C64XX_UART0
@@ -68,7 +70,6 @@ static const int udivslot[] = {
 
 void serial_setbrg(void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
        s3c64xx_uart *const uart = s3c64xx_get_base_uart(UART_NR);
        u32 pclk = get_PCLK();
        u32 baudrate = gd->baudrate;
@@ -119,22 +120,6 @@ int serial_getc(void)
        return uart->URXH & 0xff;
 }
 
-#ifdef CONFIG_HWFLOW
-static int hwflow;             /* turned off by default */
-int hwflow_onoff(int on)
-{
-       switch (on) {
-       case 1:
-               hwflow = 1;     /* turn on */
-               break;
-       case -1:
-               hwflow = 0;     /* turn off */
-               break;
-       }
-       return hwflow;
-}
-#endif
-
 #ifdef CONFIG_MODEM_SUPPORT
 static int be_quiet;
 void disable_putc(void)
@@ -164,11 +149,6 @@ void serial_putc(const char c)
        /* wait for room in the tx FIFO */
        while (!(uart->UTRSTAT & 0x2));
 
-#ifdef CONFIG_HWFLOW
-       /* Wait for CTS up */
-       while (hwflow && !(uart->UMSTAT & 0x1));
-#endif
-
        uart->UTXH = c;
 
        /* If \n, also do \r */