From: Tom Rini <trini@ti.com>
Date: Mon, 8 Oct 2012 21:46:23 +0000 (-0700)
Subject: serial: zynq: Move serial registration from serial_initialize()
X-Git-Tag: v2013.01-rc1~337
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=51d8102f8ed7a52348c13ccc10bdc6821f0f7632;p=u-boot

serial: zynq: Move serial registration from serial_initialize()

Move the registration of zynq_serialN_device ports from default
serial_initialize() into driver specific function called from
serial_initialize(). This slims down the serial_initialize() call
to a bare tracker of all possible serial port registration routines
in U-Boot.

The newly implemented zynq_serial_initialize() function, which is
implemented inside of the serial_zynq driver allows encapsulation
of zynq_serialN_device within the serial_zynq driver itself.

Also, remove the exports of zynq_serialN_device from include/serial.h
as they are no longer needed. This is simply because the implementation of
default_serial_console() is wrapped into the serial_zynq driver and
the default console is picked by CONFIG_SERIAL<N> macro in config file.

Signed-off-by: Tom Rini <trini@ti.com>
---

diff --git a/common/serial.c b/common/serial.c
index bed907e25c..a1bef16d32 100644
--- a/common/serial.c
+++ b/common/serial.c
@@ -44,6 +44,7 @@ serial_initfunc(mpc8xx_serial_initialize);
 serial_initfunc(pxa_serial_initialize);
 serial_initfunc(s3c24xx_serial_initialize);
 serial_initfunc(s5p_serial_initialize);
+serial_initfunc(zynq_serial_initalize);
 
 void serial_register(struct serial_device *dev)
 {
@@ -111,14 +112,7 @@ void serial_initialize(void)
 	serial_register(&uartlite_serial3_device);
 # endif /* XILINX_UARTLITE_BASEADDR3 */
 #endif /* CONFIG_XILINX_UARTLITE */
-#if defined(CONFIG_ZYNQ_SERIAL)
-# ifdef CONFIG_ZYNQ_SERIAL_BASEADDR0
-	serial_register(&uart_zynq_serial0_device);
-# endif
-# ifdef CONFIG_ZYNQ_SERIAL_BASEADDR1
-	serial_register(&uart_zynq_serial1_device);
-# endif
-#endif
+	zynq_serial_initalize();
 	serial_assign(default_serial_console()->name);
 }
 
diff --git a/drivers/serial/serial_zynq.c b/drivers/serial/serial_zynq.c
index 35bbebe705..5ac2561081 100644
--- a/drivers/serial/serial_zynq.c
+++ b/drivers/serial/serial_zynq.c
@@ -245,3 +245,13 @@ __weak struct serial_device *default_serial_console(void)
 	return NULL;
 }
 #endif
+
+void zynq_serial_initalize(void)
+{
+#ifdef CONFIG_ZYNQ_SERIAL_BASEADDR0
+	serial_register(&uart_zynq_serial0_device);
+#endif
+#ifdef CONFIG_ZYNQ_SERIAL_BASEADDR1
+	serial_register(&uart_zynq_serial1_device);
+#endif
+}
diff --git a/include/serial.h b/include/serial.h
index ee7a53f46e..773eace2ec 100644
--- a/include/serial.h
+++ b/include/serial.h
@@ -72,11 +72,6 @@ extern struct serial_device bfin_serial2_device;
 extern struct serial_device bfin_serial3_device;
 #endif
 
-#if defined(CONFIG_ZYNQ_SERIAL)
-extern struct serial_device uart_zynq_serial0_device;
-extern struct serial_device uart_zynq_serial1_device;
-#endif
-
 extern void serial_register(struct serial_device *);
 extern void serial_initialize(void);
 extern void serial_stdio_init(void);