From: Aldo Brett Cedillo Martinez aldo.cedillo@ti.com
Instead of using "struct serial_device zoom2_serial_device0" and "struct serial_device zoom3_serial_device0", we now use a single "struct serial_device zoom_serial_device0".
Signed-off-by: Aldo Brett Cedillo Martinez aldo.cedillo@ti.com --- board/logicpd/zoom2/zoom2_serial.h | 2 +- board/logicpd/zoom3/zoom3_serial.h | 2 +- include/configs/omap3_zoom2.h | 2 +- include/configs/omap3_zoom3.h | 2 +- include/serial.h | 18 +++++------------- 5 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/board/logicpd/zoom2/zoom2_serial.h b/board/logicpd/zoom2/zoom2_serial.h index a6d2427..dbc9d36 100644 --- a/board/logicpd/zoom2/zoom2_serial.h +++ b/board/logicpd/zoom2/zoom2_serial.h @@ -60,7 +60,7 @@ int quad_tstc_##n(void) \ { \ return quad_tstc_dev(QUAD_BASE_##n); \ } \ -struct serial_device zoom2_serial_device##n = \ +struct serial_device zoom_serial_device##n = \ { \ N(n), \ U(n), \ diff --git a/board/logicpd/zoom3/zoom3_serial.h b/board/logicpd/zoom3/zoom3_serial.h index f581a7f..f72e6f3 100644 --- a/board/logicpd/zoom3/zoom3_serial.h +++ b/board/logicpd/zoom3/zoom3_serial.h @@ -60,7 +60,7 @@ int quad_tstc_##n(void) \ { \ return quad_tstc_dev(QUAD_BASE_##n); \ } \ -struct serial_device zoom3_serial_device##n = \ +struct serial_device zoom_serial_device##n = \ { \ N(n), \ U(n), \ diff --git a/include/configs/omap3_zoom2.h b/include/configs/omap3_zoom2.h index aaf929e..eef95fe 100644 --- a/include/configs/omap3_zoom2.h +++ b/include/configs/omap3_zoom2.h @@ -83,7 +83,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 (&zoom_serial_device0)
#define V_NS16550_CLK (1843200) /* 1.8432 Mhz */
diff --git a/include/configs/omap3_zoom3.h b/include/configs/omap3_zoom3.h index b92c0c2..3ddaeff 100644 --- a/include/configs/omap3_zoom3.h +++ b/include/configs/omap3_zoom3.h @@ -85,7 +85,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 ZOOM3_DEFAULT_SERIAL_DEVICE (&zoom3_serial_device0) +#define ZOOM3_DEFAULT_SERIAL_DEVICE (&zoom_serial_device0)
#define V_NS16550_CLK (1843200) /* 1.8432 Mhz */
diff --git a/include/serial.h b/include/serial.h index 236e5d1..963bb86 100644 --- a/include/serial.h +++ b/include/serial.h @@ -59,20 +59,12 @@ extern struct serial_device s5p_serial2_device; extern struct serial_device s5p_serial3_device; #endif
-#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; +#if defined(CONFIG_OMAP3_ZOOM2) || defined(CONFIG_OMAP3_ZOOM3) +extern struct serial_device zoom_serial_device0; +extern struct serial_device zoom_serial_device1; +extern struct serial_device zoom_serial_device2; +extern struct serial_device zoom_serial_device3; #endif - -#if defined(CONFIG_OMAP3_ZOOM3) -extern struct serial_device zoom3_serial_device0; -extern struct serial_device zoom3_serial_device1; -extern struct serial_device zoom3_serial_device2; -extern struct serial_device zoom3_serial_device3; -#endif - extern struct serial_device serial_ffuart_device; extern struct serial_device serial_btuart_device; extern struct serial_device serial_stuart_device;