Move the registration of s5p_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 s5p_serial_initialize() function, which is implemented inside of the serial_s5p driver allows encapsulation of s5p_serialN_device within the serial_s5p driver itself.
Also, remove the exports of s5p_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_s5p 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: Minkyu Kang mk7.kang@samsung.com --- common/serial.c | 8 ++------ drivers/serial/serial_s5p.c | 8 ++++++++ include/serial.h | 7 ------- 3 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/common/serial.c b/common/serial.c index d457d23..c021c3f 100644 --- a/common/serial.c +++ b/common/serial.c @@ -43,6 +43,7 @@ static void serial_null(void) serial_initfunc(mpc8xx_serial_initialize); serial_initfunc(pxa_serial_initialize); serial_initfunc(s3c24xx_serial_initialize); +serial_initfunc(s5p_serial_initialize);
void serial_register(struct serial_device *dev) { @@ -78,12 +79,7 @@ void serial_initialize(void) #endif /* CONFIG_SYS_NS16550_SERIAL */ pxa_serial_initialize(); s3c24xx_serial_initialize(); -#if defined(CONFIG_S5P) - serial_register(&s5p_serial0_device); - serial_register(&s5p_serial1_device); - serial_register(&s5p_serial2_device); - serial_register(&s5p_serial3_device); -#endif + s5p_serial_initialize(); #if defined(CONFIG_MPC512X) #if defined(CONFIG_SYS_PSC1) serial_register(&serial1_device); diff --git a/drivers/serial/serial_s5p.c b/drivers/serial/serial_s5p.c index 43cbc4f..3c41242 100644 --- a/drivers/serial/serial_s5p.c +++ b/drivers/serial/serial_s5p.c @@ -221,3 +221,11 @@ __weak struct serial_device *default_serial_console(void) #error "CONFIG_SERIAL? missing." #endif } + +void s5p_serial_initialize(void) +{ + serial_register(&s5p_serial0_device); + serial_register(&s5p_serial1_device); + serial_register(&s5p_serial2_device); + serial_register(&s5p_serial3_device); +} diff --git a/include/serial.h b/include/serial.h index 8eff282..773eace 100644 --- a/include/serial.h +++ b/include/serial.h @@ -57,13 +57,6 @@ extern struct serial_device uartlite_serial2_device; extern struct serial_device uartlite_serial3_device; #endif
-#if defined(CONFIG_S5P) -extern struct serial_device s5p_serial0_device; -extern struct serial_device s5p_serial1_device; -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;