diff options
| author | Marek Vasut <marex@denx.de> | 2012-09-12 16:01:16 +0200 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-10-15 11:53:49 -0700 |
| commit | 28af6385c7a9c5114b34094631944d09369c5e15 (patch) | |
| tree | 41adaef3718fe17b896248cd204c8d79e9d053d1 | |
| parent | f0eb1f61b02ebd5c86c1db4399f7d78518377910 (diff) | |
| download | olio-uboot-2014.01-28af6385c7a9c5114b34094631944d09369c5e15.tar.xz olio-uboot-2014.01-28af6385c7a9c5114b34094631944d09369c5e15.zip | |
serial: s3c24xx: Move serial registration from serial_initialize()
Move the registration of s3c24xx_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 s3c24xx_serial_initialize() function, which is
implemented inside of the serial_s3c24xx driver allows encapsulation
of s3c24xx_serialN_device within the serial_s3c24xx driver itself.
Also, remove the exports of s3c24xx_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_s3c24xx 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: C Nauman <cnauman@diagraph.com>
| -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 5cbfb6d59..9e88f9778 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 fa6aac081..625c6b7d0 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 84a77a1b5..4fac9af4a 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; |