serial: zoom2: Remove zoom2 serial prototypes from serial.h

Remove the prototypes for zoom2_serial_deviceN from serial.h . This
can't be done right away, as they are referenced from the zoom2
config file. Therefore, adjust the code so the config file only
specifies number of the port. Then, replace the simple return in
default_serial_console() with a switch across possible values, which
returns the zoom2_serial_deviceN . With such adjustment in place,
the exported prototypes in serial.h can be safely removed.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Tom Rini <trini@ti.com>

diff --git a/board/logicpd/zoom2/zoom2_serial.c b/board/logicpd/zoom2/zoom2_serial.c
index 74f165fa25f37258964d0bdafdbf4900e0e1c879..9b7aea859025f24971a6db9b2b1798362f8380cf 100644 (file)
--- a/board/logicpd/zoom2/zoom2_serial.c
+++ b/board/logicpd/zoom2/zoom2_serial.c
@@ -135,5 +135,10 @@ QUAD_INIT (3)
 
 struct serial_device *default_serial_console(void)
 {
-       return ZOOM2_DEFAULT_SERIAL_DEVICE;
+       switch (ZOOM2_DEFAULT_SERIAL_DEVICE) {
+       case 0: return &zoom2_serial_device0;
+       case 1: return &zoom2_serial_device1;
+       case 2: return &zoom2_serial_device2;
+       case 3: return &zoom2_serial_device3;
+       }
 }

diff --git a/include/configs/omap3_zoom2.h b/include/configs/omap3_zoom2.h
index 4447dff00d7709ba1134b775014b9780fdb008cb..a7cc5fc4f66c523a959511b44a947d16e5d18e05 100644 (file)
--- a/include/configs/omap3_zoom2.h
+++ b/include/configs/omap3_zoom2.h
@@ -81,7 +81,7 @@
  * 0 - 1 : first  USB with respect to the left edge of the debug board
  * 2 - 3 : second USB with respect to the left edge of the debug board
  */
-#define ZOOM2_DEFAULT_SERIAL_DEVICE    (&zoom2_serial_device0)
+#define ZOOM2_DEFAULT_SERIAL_DEVICE    0
 
 #define V_NS16550_CLK                  (1843200)       /* 1.8432 Mhz */
 

diff --git a/include/serial.h b/include/serial.h
index 5f9899ed21214b656a1edbe48ffad55b0600b55b..01a86b44dd98f36e66d9261712c2674b318fc45b 100644 (file)
--- a/include/serial.h
+++ b/include/serial.h
@@ -39,13 +39,6 @@ extern struct serial_device serial1_device;
 extern struct serial_device eserial1_device;
 extern struct serial_device eserial2_device;
 
-#if defined(CONFIG_OMAP3_ZOOM2)
-extern struct serial_device zoom2_serial_device0;
-extern struct serial_device zoom2_serial_device1;
-extern struct serial_device zoom2_serial_device2;
-extern struct serial_device zoom2_serial_device3;
-#endif
-
 extern void serial_register(struct serial_device *);
 extern void serial_initialize(void);
 extern void serial_stdio_init(void);