Apply k4412 kernel from HardKernel for ODROID-X.

5 files changed, 21 insertions, 35 deletions

diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 9789293a844..9b178ef30ae 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -537,8 +537,8 @@ config SERIAL_S3C6400
 
 config SERIAL_S5PV210
         tristate "Samsung S5PV210 Serial port support"
-        depends on SERIAL_SAMSUNG && (CPU_S5PV210 || CPU_EXYNOS4210)
-        select SERIAL_SAMSUNG_UARTS_4 if (CPU_S5PV210 || CPU_EXYNOS4210)
+        depends on SERIAL_SAMSUNG && (CPU_S5PV210 || ARCH_EXYNOS)
+        select SERIAL_SAMSUNG_UARTS_4 if (CPU_S5PV210 || ARCH_EXYNOS)
         default y
         help
           Serial port support for Samsung's S5P Family of SoC's
diff --git a/drivers/tty/serial/s5pv210.c b/drivers/tty/serial/s5pv210.c
index dd194dc80ee..ce7a0778284 100644
--- a/drivers/tty/serial/s5pv210.c
+++ b/drivers/tty/serial/s5pv210.c
@@ -18,6 +18,7 @@
 #include <linux/init.h>
 #include <linux/serial_core.h>
 #include <linux/serial.h>
+#include <linux/delay.h>
 
 #include <asm/irq.h>
 #include <mach/hardware.h>
@@ -83,6 +84,12 @@ static int s5pv210_serial_resetport(struct uart_port *port,
         wr_regl(port, S3C2410_UFCON, cfg->ufcon | S3C2410_UFCON_RESETBOTH);
         wr_regl(port, S3C2410_UFCON, cfg->ufcon);
 
+        wr_regl(port, S3C64XX_UINTM, 0xf);
+        wr_regl(port, S3C64XX_UINTP, 0xf);
+
+        /* It is need to delay when reset FIFO register */
+        udelay(1);
+
         return 0;
 }
 
@@ -135,13 +142,6 @@ static struct platform_driver s5p_serial_driver = {
         },
 };
 
-static int __init s5pv210_serial_console_init(void)
-{
-        return s3c24xx_serial_initconsole(&s5p_serial_driver, s5p_uart_inf);
-}
-
-console_initcall(s5pv210_serial_console_init);
-
 static int __init s5p_serial_init(void)
 {
         return s3c24xx_serial_init(&s5p_serial_driver, *s5p_uart_inf);
diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
index f66f6482930..ab179b867da 100644
--- a/drivers/tty/serial/samsung.c
+++ b/drivers/tty/serial/samsung.c
@@ -377,12 +377,14 @@ static void s3c24xx_serial_shutdown(struct uart_port *port)
         struct s3c24xx_uart_port *ourport = to_ourport(port);
 
         if (ourport->tx_claimed) {
+                disable_irq(ourport->tx_irq);
                 free_irq(ourport->tx_irq, ourport);
                 tx_enabled(port) = 0;
                 ourport->tx_claimed = 0;
         }
 
         if (ourport->rx_claimed) {
+                disable_irq(ourport->rx_irq);
                 free_irq(ourport->rx_irq, ourport);
                 ourport->rx_claimed = 0;
                 rx_enabled(port) = 0;
@@ -608,6 +610,7 @@ static unsigned int s3c24xx_serial_getclk(struct uart_port *port,
                 unsigned int deviation = (1<<30)|((1<<30)-1);
                 int calc_deviation;
 
+                best = res;
                 for (sptr = res; sptr < resptr; sptr++) {
                         calc_deviation = baud - sptr->calc;
                         if (calc_deviation < 0)
@@ -676,7 +679,7 @@ static void s3c24xx_serial_set_termios(struct uart_port *port,
          * Ask the core to calculate the divisor for us.
          */
 
-        baud = uart_get_baud_rate(port, termios, old, 0, 115200*8);
+        baud = uart_get_baud_rate(port, termios, old, 0, 3000000);
 
         if (baud == 38400 && (port->flags & UPF_SPD_MASK) == UPF_SPD_CUST)
                 quot = port->custom_divisor;
@@ -1132,7 +1135,7 @@ static ssize_t s3c24xx_serial_show_clksrc(struct device *dev,
         struct uart_port *port = s3c24xx_dev_to_port(dev);
         struct s3c24xx_uart_port *ourport = to_ourport(port);
 
-        return snprintf(buf, PAGE_SIZE, "* %s\n", ourport->clksrc->name);
+        return snprintf(buf, PAGE_SIZE, "* %s\n", ourport->clksrc->name ?: "(null)");
 }
 
 static DEVICE_ATTR(clock_source, S_IRUGO, s3c24xx_serial_show_clksrc, NULL);
@@ -1416,10 +1419,8 @@ s3c24xx_serial_console_setup(struct console *co, char *options)
 
         /* is the port configured? */
 
-        if (port->mapbase == 0x0) {
-                co->index = 0;
-                port = &s3c24xx_serial_ports[co->index].port;
-        }
+        if (port->mapbase == 0x0)
+                return -ENODEV;
 
         cons_uart = port;
 
@@ -1451,7 +1452,8 @@ static struct console s3c24xx_serial_console = {
         .flags          = CON_PRINTBUFFER,
         .index          = -1,
         .write          = s3c24xx_serial_console_write,
-        .setup          = s3c24xx_serial_console_setup
+        .setup          = s3c24xx_serial_console_setup,
+        .data           = &s3c24xx_uart_drv,
 };
 
 int s3c24xx_serial_initconsole(struct platform_driver *drv,
diff --git a/drivers/tty/serial/samsung.h b/drivers/tty/serial/samsung.h
index 5b098cd7604..a69d9a54be9 100644
--- a/drivers/tty/serial/samsung.h
+++ b/drivers/tty/serial/samsung.h
@@ -79,25 +79,6 @@ extern int s3c24xx_serial_initconsole(struct platform_driver *drv,
 extern int s3c24xx_serial_init(struct platform_driver *drv,
                                struct s3c24xx_uart_info *info);
 
-#ifdef CONFIG_SERIAL_SAMSUNG_CONSOLE
-
-#define s3c24xx_console_init(__drv, __inf)                              \
-static int __init s3c_serial_console_init(void)                         \
-{                                                                       \
-        struct s3c24xx_uart_info *uinfo[CONFIG_SERIAL_SAMSUNG_UARTS];   \
-        int i;                                                          \
-                                                                        \
-        for (i = 0; i < CONFIG_SERIAL_SAMSUNG_UARTS; i++)               \
-                uinfo[i] = __inf;                                       \
-        return s3c24xx_serial_initconsole(__drv, uinfo);                \
-}                                                                       \
-                                                                        \
-console_initcall(s3c_serial_console_init)
-
-#else
-#define s3c24xx_console_init(drv, inf) extern void no_console(void)
-#endif
-
 #ifdef CONFIG_SERIAL_SAMSUNG_DEBUG
 
 extern void printascii(const char *);
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index de5e33fc129..2a106a94cdd 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -91,6 +91,9 @@ static void __uart_start(struct tty_struct *tty)
         struct uart_state *state = tty->driver_data;
         struct uart_port *port = state->uart_port;
 
+        if (port->ops->wake_peer)
+                port->ops->wake_peer(port);
+
         if (!uart_circ_empty(&state->xmit) && state->xmit.buf &&
             !tty->stopped && !tty->hw_stopped)
                 port->ops->start_tx(port);