Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / drivers / serial / serial_xuartlite.c

diff --git a/drivers/serial/serial_xuartlite.c b/drivers/serial/serial_xuartlite.c
index 74546ce84688f52f3dad612d5a0987de03daec38..9cc0b7f1d2116af41dc924ba2d787fb2133c71d2 100644 (file)
--- a/drivers/serial/serial_xuartlite.c
+++ b/drivers/serial/serial_xuartlite.c
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2008 Michal Simek <monstr@monstr.eu>
+ * (C) Copyright 2008-2011 Michal Simek <monstr@monstr.eu>
  * Clean driver and add xilinx constant from header file
  *
  * (C) Copyright 2004 Atmark Techno, Inc.
@@ -25,57 +25,142 @@
  */
 
 #include <config.h>
+#include <common.h>
 #include <asm/io.h>
-
-#ifdef CONFIG_XILINX_UARTLITE
-
-#define RX_FIFO_OFFSET         0 /* receive FIFO, read only */
-#define TX_FIFO_OFFSET         4 /* transmit FIFO, write only */
-#define STATUS_REG_OFFSET      8 /* status register, read only */
+#include <linux/compiler.h>
+#include <serial.h>
 
 #define SR_TX_FIFO_FULL                0x08 /* transmit FIFO full */
 #define SR_RX_FIFO_VALID_DATA  0x01 /* data in receive FIFO */
 #define SR_RX_FIFO_FULL                0x02 /* receive FIFO full */
 
-#define UARTLITE_STATUS                (CONFIG_SERIAL_BASE + STATUS_REG_OFFSET)
-#define UARTLITE_TX_FIFO       (CONFIG_SERIAL_BASE + TX_FIFO_OFFSET)
-#define UARTLITE_RX_FIFO       (CONFIG_SERIAL_BASE + RX_FIFO_OFFSET)
+struct uartlite {
+       unsigned int rx_fifo;
+       unsigned int tx_fifo;
+       unsigned int status;
+};
 
-int serial_init(void)
+static struct uartlite *userial_ports[4] = {
+#ifdef XILINX_UARTLITE_BASEADDR
+       [0] = (struct uartlite *)XILINX_UARTLITE_BASEADDR,
+#endif
+#ifdef XILINX_UARTLITE_BASEADDR1
+       [1] = (struct uartlite *)XILINX_UARTLITE_BASEADDR1,
+#endif
+#ifdef XILINX_UARTLITE_BASEADDR2
+       [2] = (struct uartlite *)XILINX_UARTLITE_BASEADDR2,
+#endif
+#ifdef XILINX_UARTLITE_BASEADDR3
+       [3] = (struct uartlite *)XILINX_UARTLITE_BASEADDR3
+#endif
+};
+
+void uartlite_serial_putc(const char c, const int port)
 {
-       /* FIXME: Nothing for now. We should initialize fifo, etc */
-       return 0;
+       struct uartlite *regs = userial_ports[port];
+
+       if (c == '\n')
+               uartlite_serial_putc('\r', port);
+
+       while (in_be32(&regs->status) & SR_TX_FIFO_FULL)
+               ;
+       out_be32(&regs->tx_fifo, c & 0xff);
 }
 
-void serial_setbrg(void)
+void uartlite_serial_puts(const char *s, const int port)
 {
-       /* FIXME: what's this for? */
+       while (*s)
+               uartlite_serial_putc(*s++, port);
 }
 
-void serial_putc(const char c)
+int uartlite_serial_getc(const int port)
 {
-       if (c == '\n')
-               serial_putc('\r');
-       while (in_be32((u32 *) UARTLITE_STATUS) & SR_TX_FIFO_FULL);
-       out_be32((u32 *) UARTLITE_TX_FIFO, (unsigned char) (c & 0xff));
+       struct uartlite *regs = userial_ports[port];
+
+       while (!(in_be32(&regs->status) & SR_RX_FIFO_VALID_DATA))
+               ;
+       return in_be32(&regs->rx_fifo) & 0xff;
 }
 
-void serial_puts(const char * s)
+int uartlite_serial_tstc(const int port)
 {
-       while (*s) {
-               serial_putc(*s++);
-       }
+       struct uartlite *regs = userial_ports[port];
+
+       return in_be32(&regs->status) & SR_RX_FIFO_VALID_DATA;
 }
 
-int serial_getc(void)
+static int uartlite_serial_init(const int port)
 {
-       while (!(in_be32((u32 *) UARTLITE_STATUS) & SR_RX_FIFO_VALID_DATA));
-       return in_be32((u32 *) UARTLITE_RX_FIFO) & 0xff;
+       if (userial_ports[port])
+               return 0;
+       return -1;
+}
+
+/* Multi serial device functions */
+#define DECLARE_ESERIAL_FUNCTIONS(port) \
+       int userial##port##_init(void) \
+                               { return uartlite_serial_init(port); } \
+       void userial##port##_setbrg(void) {} \
+       int userial##port##_getc(void) \
+                               { return uartlite_serial_getc(port); } \
+       int userial##port##_tstc(void) \
+                               { return uartlite_serial_tstc(port); } \
+       void userial##port##_putc(const char c) \
+                               { uartlite_serial_putc(c, port); } \
+       void userial##port##_puts(const char *s) \
+                               { uartlite_serial_puts(s, port); }
+
+/* Serial device descriptor */
+#define INIT_ESERIAL_STRUCTURE(port, __name) { \
+       .name   = __name,                       \
+       .start  = userial##port##_init,         \
+       .stop   = NULL,                         \
+       .setbrg = userial##port##_setbrg,       \
+       .getc   = userial##port##_getc,         \
+       .tstc   = userial##port##_tstc,         \
+       .putc   = userial##port##_putc,         \
+       .puts   = userial##port##_puts,         \
 }
 
-int serial_tstc(void)
+DECLARE_ESERIAL_FUNCTIONS(0);
+struct serial_device uartlite_serial0_device =
+       INIT_ESERIAL_STRUCTURE(0, "ttyUL0");
+DECLARE_ESERIAL_FUNCTIONS(1);
+struct serial_device uartlite_serial1_device =
+       INIT_ESERIAL_STRUCTURE(1, "ttyUL1");
+DECLARE_ESERIAL_FUNCTIONS(2);
+struct serial_device uartlite_serial2_device =
+       INIT_ESERIAL_STRUCTURE(2, "ttyUL2");
+DECLARE_ESERIAL_FUNCTIONS(3);
+struct serial_device uartlite_serial3_device =
+       INIT_ESERIAL_STRUCTURE(3, "ttyUL3");
+
+__weak struct serial_device *default_serial_console(void)
 {
-       return (in_be32((u32 *) UARTLITE_STATUS) & SR_RX_FIFO_VALID_DATA);
+       if (userial_ports[0])
+               return &uartlite_serial0_device;
+       if (userial_ports[1])
+               return &uartlite_serial1_device;
+       if (userial_ports[2])
+               return &uartlite_serial2_device;
+       if (userial_ports[3])
+               return &uartlite_serial3_device;
+
+       return NULL;
 }
 
-#endif /* CONFIG_MICROBLZE */
+void uartlite_serial_initialize(void)
+{
+#ifdef XILINX_UARTLITE_BASEADDR
+       serial_register(&uartlite_serial0_device);
+#endif /* XILINX_UARTLITE_BASEADDR */
+#ifdef XILINX_UARTLITE_BASEADDR1
+       serial_register(&uartlite_serial1_device);
+#endif /* XILINX_UARTLITE_BASEADDR1 */
+#ifdef XILINX_UARTLITE_BASEADDR2
+       serial_register(&uartlite_serial2_device);
+#endif /* XILINX_UARTLITE_BASEADDR2 */
+#ifdef XILINX_UARTLITE_BASEADDR3
+       serial_register(&uartlite_serial3_device);
+#endif /* XILINX_UARTLITE_BASEADDR3 */
+}