Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[mirror_ubuntu-artful-kernel.git] / drivers / serial / uartlite.c

diff --git a/drivers/serial/uartlite.c b/drivers/serial/uartlite.c
index c761b2223129af9ea80107ade2580fd2793524ba..d2fce865b73180a70e9e3d3bf7435dc07b79fcc7 100644 (file)
--- a/drivers/serial/uartlite.c
+++ b/drivers/serial/uartlite.c
@@ -322,6 +322,26 @@ static int ulite_verify_port(struct uart_port *port, struct serial_struct *ser)
        return -EINVAL;
 }
 
+#ifdef CONFIG_CONSOLE_POLL
+static int ulite_get_poll_char(struct uart_port *port)
+{
+       if (!(ioread32be(port->membase + ULITE_STATUS)
+                                               & ULITE_STATUS_RXVALID))
+               return NO_POLL_CHAR;
+
+       return ioread32be(port->membase + ULITE_RX);
+}
+
+static void ulite_put_poll_char(struct uart_port *port, unsigned char ch)
+{
+       while (ioread32be(port->membase + ULITE_STATUS) & ULITE_STATUS_TXFULL)
+               cpu_relax();
+
+       /* write char to device */
+       iowrite32be(ch, port->membase + ULITE_TX);
+}
+#endif
+
 static struct uart_ops ulite_ops = {
        .tx_empty       = ulite_tx_empty,
        .set_mctrl      = ulite_set_mctrl,
@@ -338,7 +358,11 @@ static struct uart_ops ulite_ops = {
        .release_port   = ulite_release_port,
        .request_port   = ulite_request_port,
        .config_port    = ulite_config_port,
-       .verify_port    = ulite_verify_port
+       .verify_port    = ulite_verify_port,
+#ifdef CONFIG_CONSOLE_POLL
+       .poll_get_char  = ulite_get_poll_char,
+       .poll_put_char  = ulite_put_poll_char,
+#endif
 };
 
 /* ---------------------------------------------------------------------
@@ -584,7 +608,7 @@ static struct platform_driver ulite_platform_driver = {
  */
 #if defined(CONFIG_OF) && (defined(CONFIG_PPC32) || defined(CONFIG_MICROBLAZE))
 static int __devinit
-ulite_of_probe(struct of_device *op, const struct of_device_id *match)
+ulite_of_probe(struct platform_device *op, const struct of_device_id *match)
 {
        struct resource res;
        const unsigned int *id;
@@ -605,7 +629,7 @@ ulite_of_probe(struct of_device *op, const struct of_device_id *match)
        return ulite_assign(&op->dev, id ? *id : -1, res.start, irq);
 }
 
-static int __devexit ulite_of_remove(struct of_device *op)
+static int __devexit ulite_of_remove(struct platform_device *op)
 {
        return ulite_release(&op->dev);
 }