summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2012-09-12 20:02:05 +0200
committerTom Rini <trini@ti.com>2012-10-15 11:53:50 -0700
commitabc0ed8da1a0a0c6c6e6cd4e752cb8e91bd49bb1 (patch)
treec3b882ab86f4b0c664763342f7ca526e00444310
parent918327c8f08022ae8f2b90f5b2c532c1463ce162 (diff)
downloadu-boot-imx-abc0ed8da1a0a0c6c6e6cd4e752cb8e91bd49bb1.zip
u-boot-imx-abc0ed8da1a0a0c6c6e6cd4e752cb8e91bd49bb1.tar.gz
u-boot-imx-abc0ed8da1a0a0c6c6e6cd4e752cb8e91bd49bb1.tar.bz2
serial: ns16550: Move serial registration from serial_initialize()
Move the registration of eserialN_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 ns16550_serial_initialize() function, which is implemented inside of the ns16550 serial driver allows encapsulation of eserialN_device within the ns16550 serial driver itself. Also, remove the exports of eserialN_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 ns16550 serial driver and the default console is picked by CONFIG_SERIAL<N> macro in config file. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Marek Vasut <marek.vasut@gmail.com> Cc: Tom Rini <trini@ti.com> Cc: Anatolij Gustschin <agust@denx.de> Cc: Stefan Roese <sr@denx.de> Cc: Mike Frysinger <vapier@gentoo.org> Cc: Michal Simek <monstr@monstr.eu>
-rw-r--r--common/serial.c16
-rw-r--r--drivers/serial/serial.c16
-rw-r--r--include/serial.h8
3 files changed, 20 insertions, 20 deletions
diff --git a/common/serial.c b/common/serial.c
index 2ede80e..84f05df 100644
--- a/common/serial.c
+++ b/common/serial.c
@@ -41,6 +41,7 @@ static void serial_null(void)
__attribute__((weak, alias("serial_null")));
serial_initfunc(mpc8xx_serial_initialize);
+serial_initfunc(ns16550_serial_initialize);
serial_initfunc(pxa_serial_initialize);
serial_initfunc(s3c24xx_serial_initialize);
serial_initfunc(s5p_serial_initialize);
@@ -66,20 +67,7 @@ void serial_register(struct serial_device *dev)
void serial_initialize(void)
{
mpc8xx_serial_initialize();
-#if defined(CONFIG_SYS_NS16550_SERIAL)
-#if defined(CONFIG_SYS_NS16550_COM1)
- serial_register(&eserial1_device);
-#endif
-#if defined(CONFIG_SYS_NS16550_COM2)
- serial_register(&eserial2_device);
-#endif
-#if defined(CONFIG_SYS_NS16550_COM3)
- serial_register(&eserial3_device);
-#endif
-#if defined(CONFIG_SYS_NS16550_COM4)
- serial_register(&eserial4_device);
-#endif
-#endif /* CONFIG_SYS_NS16550_SERIAL */
+ ns16550_serial_initialize();
pxa_serial_initialize();
s3c24xx_serial_initialize();
s5p_serial_initialize();
diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index 9d92dee..00ad97c 100644
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -340,4 +340,20 @@ __weak struct serial_device *default_serial_console(void)
#endif
}
+void ns16550_serial_initialize(void)
+{
+#if defined(CONFIG_SYS_NS16550_COM1)
+ serial_register(&eserial1_device);
+#endif
+#if defined(CONFIG_SYS_NS16550_COM2)
+ serial_register(&eserial2_device);
+#endif
+#if defined(CONFIG_SYS_NS16550_COM3)
+ serial_register(&eserial3_device);
+#endif
+#if defined(CONFIG_SYS_NS16550_COM4)
+ serial_register(&eserial4_device);
+#endif
+}
+
#endif /* CONFIG_SERIAL_MULTI */
diff --git a/include/serial.h b/include/serial.h
index 71822c6..b44fac2 100644
--- a/include/serial.h
+++ b/include/serial.h
@@ -34,14 +34,10 @@ extern struct serial_device *default_serial_console(void);
defined(CONFIG_MICROBLAZE)
extern struct serial_device serial0_device;
extern struct serial_device serial1_device;
-#if defined(CONFIG_SYS_NS16550_SERIAL)
+#endif
+
extern struct serial_device eserial1_device;
extern struct serial_device eserial2_device;
-extern struct serial_device eserial3_device;
-extern struct serial_device eserial4_device;
-#endif /* CONFIG_SYS_NS16550_SERIAL */
-
-#endif
#if defined(CONFIG_OMAP3_ZOOM2)
extern struct serial_device zoom2_serial_device0;