diff options
| -rw-r--r-- | common/serial.c | 11 | ||||
| -rw-r--r-- | drivers/serial/serial_pxa.c | 13 | ||||
| -rw-r--r-- | include/serial.h | 4 |
3 files changed, 15 insertions, 13 deletions
diff --git a/common/serial.c b/common/serial.c index 9e88f9778..70f6261dc 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(pxa_serial_initialize); serial_initfunc(s3c24xx_serial_initialize); void serial_register(struct serial_device *dev) @@ -75,15 +76,7 @@ void serial_initialize(void) serial_register(&eserial4_device); #endif #endif /* CONFIG_SYS_NS16550_SERIAL */ -#if defined(CONFIG_FFUART) - serial_register(&serial_ffuart_device); -#endif -#if defined(CONFIG_BTUART) - serial_register(&serial_btuart_device); -#endif -#if defined(CONFIG_STUART) - serial_register(&serial_stuart_device); -#endif + pxa_serial_initialize(); s3c24xx_serial_initialize(); #if defined(CONFIG_S5P) serial_register(&s5p_serial0_device); diff --git a/drivers/serial/serial_pxa.c b/drivers/serial/serial_pxa.c index bd3b3cf7c..46d76894e 100644 --- a/drivers/serial/serial_pxa.c +++ b/drivers/serial/serial_pxa.c @@ -314,4 +314,17 @@ __weak struct serial_device *default_serial_console(void) #error "Bad CONFIG_CONS_INDEX." #endif } + +void pxa_serial_initialize(void) +{ +#if defined(CONFIG_FFUART) + serial_register(&serial_ffuart_device); +#endif +#if defined(CONFIG_BTUART) + serial_register(&serial_btuart_device); +#endif +#if defined(CONFIG_STUART) + serial_register(&serial_stuart_device); +#endif +} #endif diff --git a/include/serial.h b/include/serial.h index 4fac9af4a..10fce02b5 100644 --- a/include/serial.h +++ b/include/serial.h @@ -71,10 +71,6 @@ extern struct serial_device zoom2_serial_device2; extern struct serial_device zoom2_serial_device3; #endif -extern struct serial_device serial_ffuart_device; -extern struct serial_device serial_btuart_device; -extern struct serial_device serial_stuart_device; - #if defined(CONFIG_SYS_BFIN_UART) extern void serial_register_bfin_uart(void); extern struct serial_device bfin_serial0_device; |