Move the registration of 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 mpc512x_serial_initialize() function, which is implemented inside of the mpc512x serial driver allows encapsulation of serialN_device within the mpc512x serial driver itself.
Also, remove the exports of 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 mpx512x 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 --- arch/powerpc/cpu/mpc512x/serial.c | 16 ++++++++++++++++ common/serial.c | 16 ++-------------- include/serial.h | 7 ------- 3 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/arch/powerpc/cpu/mpc512x/serial.c b/arch/powerpc/cpu/mpc512x/serial.c index f4f52ad..bc10c50 100644 --- a/arch/powerpc/cpu/mpc512x/serial.c +++ b/arch/powerpc/cpu/mpc512x/serial.c @@ -365,6 +365,22 @@ __weak struct serial_device *default_serial_console(void) #endif }
+void mpc512x_serial_initialize(void) +{ +#if defined(CONFIG_SYS_PSC1) + serial_register(&serial1_device); +#endif +#if defined(CONFIG_SYS_PSC3) + serial_register(&serial3_device); +#endif +#if defined(CONFIG_SYS_PSC4) + serial_register(&serial4_device); +#endif +#if defined(CONFIG_SYS_PSC6) + serial_register(&serial6_device); +#endif +} + #else
void serial_setbrg(void) diff --git a/common/serial.c b/common/serial.c index e19a17f..08c6e2a 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(mpc512x_serial_initialize); serial_initfunc(uartlite_serial_initialize);
void serial_register(struct serial_device *dev) @@ -81,20 +82,7 @@ void serial_initialize(void) pxa_serial_initialize(); s3c24xx_serial_initialize(); s5p_serial_initialize(); -#if defined(CONFIG_MPC512X) -#if defined(CONFIG_SYS_PSC1) - serial_register(&serial1_device); -#endif -#if defined(CONFIG_SYS_PSC3) - serial_register(&serial3_device); -#endif -#if defined(CONFIG_SYS_PSC4) - serial_register(&serial4_device); -#endif -#if defined(CONFIG_SYS_PSC6) - serial_register(&serial6_device); -#endif -#endif + mpc512x_serial_initialize(); #if defined(CONFIG_SYS_BFIN_UART) serial_register_bfin_uart(); #endif diff --git a/include/serial.h b/include/serial.h index 51a044d..71822c6 100644 --- a/include/serial.h +++ b/include/serial.h @@ -43,13 +43,6 @@ extern struct serial_device eserial4_device;
#endif
-#if defined(CONFIG_MPC512X) -extern struct serial_device serial1_device; -extern struct serial_device serial3_device; -extern struct serial_device serial4_device; -extern struct serial_device serial6_device; -#endif - #if defined(CONFIG_OMAP3_ZOOM2) extern struct serial_device zoom2_serial_device0; extern struct serial_device zoom2_serial_device1;