diff options
| -rw-r--r-- | common/serial.c | 7 | ||||
| -rw-r--r-- | drivers/serial/serial_s3c24x0.c | 7 | ||||
| -rw-r--r-- | include/serial.h | 6 |
3 files changed, 9 insertions, 11 deletions
diff --git a/common/serial.c b/common/serial.c index 5cbfb6d..9e88f97 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(s3c24xx_serial_initialize); void serial_register(struct serial_device *dev) { @@ -83,11 +84,7 @@ void serial_initialize(void) #if defined(CONFIG_STUART) serial_register(&serial_stuart_device); #endif -#if defined(CONFIG_S3C2410) - serial_register(&s3c24xx_serial0_device); - serial_register(&s3c24xx_serial1_device); - serial_register(&s3c24xx_serial2_device); -#endif + s3c24xx_serial_initialize(); #if defined(CONFIG_S5P) serial_register(&s5p_serial0_device); serial_register(&s5p_serial1_device); diff --git a/drivers/serial/serial_s3c24x0.c b/drivers/serial/serial_s3c24x0.c index fa6aac0..625c6b7 100644 --- a/drivers/serial/serial_s3c24x0.c +++ b/drivers/serial/serial_s3c24x0.c @@ -323,4 +323,11 @@ __weak struct serial_device *default_serial_console(void) #error "CONFIG_SERIAL? missing." #endif } + +void s3c24xx_serial_initialize(void) +{ + serial_register(&s3c24xx_serial0_device); + serial_register(&s3c24xx_serial1_device); + serial_register(&s3c24xx_serial2_device); +} #endif /* CONFIG_SERIAL_MULTI */ diff --git a/include/serial.h b/include/serial.h index 84a77a1..4fac9af 100644 --- a/include/serial.h +++ b/include/serial.h @@ -57,12 +57,6 @@ extern struct serial_device uartlite_serial2_device; extern struct serial_device uartlite_serial3_device; #endif -#if defined(CONFIG_S3C2410) -extern struct serial_device s3c24xx_serial0_device; -extern struct serial_device s3c24xx_serial1_device; -extern struct serial_device s3c24xx_serial2_device; -#endif - #if defined(CONFIG_S5P) extern struct serial_device s5p_serial0_device; extern struct serial_device s5p_serial1_device; |