1 files changed, 24 insertions, 23 deletions

diff --git a/drivers/tty/serial/altera_uart.c b/drivers/tty/serial/altera_uart.c
index 1d04c5037f25..e7903751e058 100644
--- a/drivers/tty/serial/altera_uart.c
+++ b/drivers/tty/serial/altera_uart.c
@@ -377,6 +377,26 @@ static int altera_uart_verify_port(struct uart_port *port,
         return 0;
 }
 
+#ifdef CONFIG_CONSOLE_POLL
+static int altera_uart_poll_get_char(struct uart_port *port)
+{
+        while (!(altera_uart_readl(port, ALTERA_UART_STATUS_REG) &
+                 ALTERA_UART_STATUS_RRDY_MSK))
+                cpu_relax();
+
+        return altera_uart_readl(port, ALTERA_UART_RXDATA_REG);
+}
+
+static void altera_uart_poll_put_char(struct uart_port *port, unsigned char c)
+{
+        while (!(altera_uart_readl(port, ALTERA_UART_STATUS_REG) &
+                 ALTERA_UART_STATUS_TRDY_MSK))
+                cpu_relax();
+
+        altera_uart_writel(port, c, ALTERA_UART_TXDATA_REG);
+}
+#endif
+
 /*
  *      Define the basic serial functions we support.
  */
@@ -397,35 +417,16 @@ static struct uart_ops altera_uart_ops = {
         .release_port   = altera_uart_release_port,
         .config_port    = altera_uart_config_port,
         .verify_port    = altera_uart_verify_port,
+#ifdef CONFIG_CONSOLE_POLL
+        .poll_get_char  = altera_uart_poll_get_char,
+        .poll_put_char  = altera_uart_poll_put_char,
+#endif
 };
 
 static struct altera_uart altera_uart_ports[CONFIG_SERIAL_ALTERA_UART_MAXPORTS];
 
 #if defined(CONFIG_SERIAL_ALTERA_UART_CONSOLE)
 
-int __init early_altera_uart_setup(struct altera_uart_platform_uart *platp)
-{
-        struct uart_port *port;
-        int i;
-
-        for (i = 0; i < CONFIG_SERIAL_ALTERA_UART_MAXPORTS && platp[i].mapbase; i++) {
-                port = &altera_uart_ports[i].port;
-
-                port->line = i;
-                port->type = PORT_ALTERA_UART;
-                port->mapbase = platp[i].mapbase;
-                port->membase = ioremap(port->mapbase, ALTERA_UART_SIZE);
-                port->iotype = SERIAL_IO_MEM;
-                port->irq = platp[i].irq;
-                port->uartclk = platp[i].uartclk;
-                port->flags = UPF_BOOT_AUTOCONF;
-                port->ops = &altera_uart_ops;
-                port->private_data = platp;
-        }
-
-        return 0;
-}
-
 static void altera_uart_console_putc(struct uart_port *port, const char c)
 {
         while (!(altera_uart_readl(port, ALTERA_UART_STATUS_REG) &