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

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

diff --git a/drivers/serial/serial_s3c24x0.c b/drivers/serial/serial_s3c24x0.c
index fb895fd32646c33cb68233c24a65f2b39fc6e357..0f0878a0510de1ccff4132c9ded65b355b9a4386 100644 (file)
--- a/drivers/serial/serial_s3c24x0.c
+++ b/drivers/serial/serial_s3c24x0.c
@@ -103,12 +103,6 @@ static int serial_init_dev(const int dev_index)
         */
        writel(0x245, &uart->ucon);
 
-       /* FIXME: This is sooooooooooooooooooo ugly */
-#if defined(CONFIG_ARCH_GTA02_v1) || defined(CONFIG_ARCH_GTA02_v2)
-       /* we need auto hw flow control on the gsm and gps port */
-       if (dev_index == 0 || dev_index == 1)
-               writel(0x10, &uart->umcon);
-#endif
        _serial_setbrg(dev_index);
 
        return (0);
@@ -141,14 +135,14 @@ static void _serial_putc(const char c, const int dev_index)
 {
        struct s3c24x0_uart *uart = s3c24x0_get_base_uart(dev_index);
 
+       /* If \n, also do \r */
+       if (c == '\n')
+               serial_putc('\r');
+
        while (!(readl(&uart->utrstat) & 0x2))
                /* wait for room in the tx FIFO */ ;
 
        writeb(c, &uart->utxh);
-
-       /* If \n, also do \r */
-       if (c == '\n')
-               serial_putc('\r');
 }
 
 static inline void serial_putc_dev(unsigned int dev_index, const char c)