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

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

diff --git a/drivers/serial/serial_zynq.c b/drivers/serial/serial_zynq.c
index 22c6bf099cf7a187c7a9687dd95e987a1f255877..1ff27d5f4889a5198ac14d761559360236436f87 100644 (file)
--- a/drivers/serial/serial_zynq.c
+++ b/drivers/serial/serial_zynq.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <fdtdec.h>
 #include <watchdog.h>
 #include <asm/io.h>
 #include <linux/compiler.h>
@@ -13,6 +14,8 @@
 #include <asm/arch/clk.h>
 #include <asm/arch/hardware.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 #define ZYNQ_UART_SR_TXFULL    0x00000010 /* TX FIFO full */
 #define ZYNQ_UART_SR_RXEMPTY   0x00000002 /* RX FIFO empty */
 
@@ -150,17 +153,17 @@ static int uart_zynq_serial_getc(const int port)
 
 /* Multi serial device functions */
 #define DECLARE_PSSERIAL_FUNCTIONS(port) \
-       int uart_zynq##port##_init(void) \
+       static int uart_zynq##port##_init(void) \
                                { return uart_zynq_serial_init(port); } \
-       void uart_zynq##port##_setbrg(void) \
+       static void uart_zynq##port##_setbrg(void) \
                                { return uart_zynq_serial_setbrg(port); } \
-       int uart_zynq##port##_getc(void) \
+       static int uart_zynq##port##_getc(void) \
                                { return uart_zynq_serial_getc(port); } \
-       int uart_zynq##port##_tstc(void) \
+       static int uart_zynq##port##_tstc(void) \
                                { return uart_zynq_serial_tstc(port); } \
-       void uart_zynq##port##_putc(const char c) \
+       static void uart_zynq##port##_putc(const char c) \
                                { uart_zynq_serial_putc(c, port); } \
-       void uart_zynq##port##_puts(const char *s) \
+       static void uart_zynq##port##_puts(const char *s) \
                                { uart_zynq_serial_puts(s, port); }
 
 /* Serial device descriptor */
@@ -176,12 +179,36 @@ static int uart_zynq_serial_getc(const int port)
 }
 
 DECLARE_PSSERIAL_FUNCTIONS(0);
-struct serial_device uart_zynq_serial0_device =
+static struct serial_device uart_zynq_serial0_device =
        INIT_PSSERIAL_STRUCTURE(0, "ttyPS0");
 DECLARE_PSSERIAL_FUNCTIONS(1);
-struct serial_device uart_zynq_serial1_device =
+static struct serial_device uart_zynq_serial1_device =
        INIT_PSSERIAL_STRUCTURE(1, "ttyPS1");
 
+#ifdef CONFIG_OF_CONTROL
+__weak struct serial_device *default_serial_console(void)
+{
+       const void *blob = gd->fdt_blob;
+       int node;
+       unsigned int base_addr;
+
+       node = fdt_path_offset(blob, "serial0");
+       if (node < 0)
+               return NULL;
+
+       base_addr = fdtdec_get_addr(blob, node, "reg");
+       if (base_addr == FDT_ADDR_T_NONE)
+               return NULL;
+
+       if (base_addr == ZYNQ_SERIAL_BASEADDR0)
+               return &uart_zynq_serial0_device;
+
+       if (base_addr == ZYNQ_SERIAL_BASEADDR1)
+               return &uart_zynq_serial1_device;
+
+       return NULL;
+}
+#else
 __weak struct serial_device *default_serial_console(void)
 {
 #if defined(CONFIG_ZYNQ_SERIAL_UART0)
@@ -194,8 +221,9 @@ __weak struct serial_device *default_serial_console(void)
 #endif
        return NULL;
 }
+#endif
 
-void zynq_serial_initalize(void)
+void zynq_serial_initialize(void)
 {
        serial_register(&uart_zynq_serial0_device);
        serial_register(&uart_zynq_serial1_device);