summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2012-09-12 20:07:54 +0200
committerTom Rini <trini@ti.com>2012-10-15 11:53:50 -0700
commit5ae1de0d491f7558487f90870d3506c783fee755 (patch)
treeb2f52b3968c4900c059b5eb2ed2dc2b78663aa51
parentc513d7e5301c080a782f66d27bf6652655456336 (diff)
downloadu-boot-imx-5ae1de0d491f7558487f90870d3506c783fee755.zip
u-boot-imx-5ae1de0d491f7558487f90870d3506c783fee755.tar.gz
u-boot-imx-5ae1de0d491f7558487f90870d3506c783fee755.tar.bz2
serial: bfin: Adjust serial_register_bfin_uart()
Rename the serial_register_bfin_uart() to bfin_initialize_serial() to be consistent with the rest of the naming. Next, remove it's prototype from serial.h and properly insert it into serial.c as the rest of the serial initialization functions. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Marek Vasut <marek.vasut@gmail.com> Cc: Tom Rini <trini@ti.com> Cc: Mike Frysinger <vapier@gentoo.org>
-rw-r--r--arch/blackfin/cpu/serial.c2
-rw-r--r--common/serial.c5
-rw-r--r--include/serial.h4
3 files changed, 3 insertions, 8 deletions
diff --git a/arch/blackfin/cpu/serial.c b/arch/blackfin/cpu/serial.c
index 33677ba..64340ec 100644
--- a/arch/blackfin/cpu/serial.c
+++ b/arch/blackfin/cpu/serial.c
@@ -272,7 +272,7 @@ __weak struct serial_device *default_serial_console(void)
#endif
}
-void serial_register_bfin_uart(void)
+void bfin_serial_initialize(void)
{
#ifdef UART0_DLL
serial_register(&bfin_serial0_device);
diff --git a/common/serial.c b/common/serial.c
index 84f05df..545f9e7 100644
--- a/common/serial.c
+++ b/common/serial.c
@@ -46,6 +46,7 @@ serial_initfunc(pxa_serial_initialize);
serial_initfunc(s3c24xx_serial_initialize);
serial_initfunc(s5p_serial_initialize);
serial_initfunc(zynq_serial_initalize);
+serial_initfunc(bfin_serial_initialize);
serial_initfunc(mpc512x_serial_initialize);
serial_initfunc(uartlite_serial_initialize);
@@ -72,9 +73,7 @@ void serial_initialize(void)
s3c24xx_serial_initialize();
s5p_serial_initialize();
mpc512x_serial_initialize();
-#if defined(CONFIG_SYS_BFIN_UART)
- serial_register_bfin_uart();
-#endif
+ bfin_serial_initialize();
uartlite_serial_initialize();
zynq_serial_initalize();
serial_assign(default_serial_console()->name);
diff --git a/include/serial.h b/include/serial.h
index 00efe68..5f9899e 100644
--- a/include/serial.h
+++ b/include/serial.h
@@ -46,10 +46,6 @@ extern struct serial_device zoom2_serial_device2;
extern struct serial_device zoom2_serial_device3;
#endif
-#if defined(CONFIG_SYS_BFIN_UART)
-extern void serial_register_bfin_uart(void);
-#endif
-
extern void serial_register(struct serial_device *);
extern void serial_initialize(void);
extern void serial_stdio_init(void);