[U-Boot] [PATCH] serial: Rename driver vcth to vct to support other board variants

[U-Boot] [PATCH] serial: Rename driver vcth to vct to support other board variants

[Stefan Roese]

Moved driver vcth.c to vct.c to better reflect the VCT board series.
This driver is now used by the VCT platforms:

vct_premium
vct_platinum
vct_platinumsvc

Signed-off-by: Stefan Roese <sr@denx.de>
---
 drivers/serial/Makefile          |    2 +-
 drivers/serial/{vcth.c => vct.c} |    8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)
 rename drivers/serial/{vcth.c => vct.c} (94%)

diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index 17235ff..c7a1882 100644
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -38,7 +38,7 @@ COBJS-$(CONFIG_PL011_SERIAL) += serial_pl01x.o
 COBJS-$(CONFIG_XILINX_UARTLITE) += serial_xuartlite.o
 COBJS-$(CONFIG_SCIF_CONSOLE) += serial_sh.o
 COBJS-$(CONFIG_USB_TTY) += usbtty.o
-COBJS-$(CONFIG_VCTH_SERIAL) += vcth.o
+COBJS-$(CONFIG_VCT_SERIAL) += vct.o
 
 COBJS	:= $(sort $(COBJS-y))
 SRCS	:= $(COBJS:.o=.c)
diff --git a/drivers/serial/vcth.c b/drivers/serial/vct.c
similarity index 94%
rename from drivers/serial/vcth.c
rename to drivers/serial/vct.c
index 2c847d0..556c114 100755
--- a/drivers/serial/vcth.c
+++ b/drivers/serial/vct.c
@@ -21,7 +21,11 @@
 #include <common.h>
 #include <asm/io.h>
 
+#ifdef CONFIG_VCT_PLATINUMAVC
+#define UART_1_BASE		0xBDC30000
+#else
 #define UART_1_BASE		0xBF89C000
+#endif
 
 #define	UART_RBR_OFF		0x00	/* receiver buffer reg		*/
 #define	UART_THR_OFF		0x00	/* transmit holding  reg	*/
@@ -53,7 +57,7 @@
 #define UART_7DATA_BITS		0x0002	/*   7 [bits]  1   bits   2	*/
 #define UART_8DATA_BITS		0x0003	/*   8 [bits]  1   bits   2	*/
 
-static void vcth_uart_set_baud_rate(u32 address, u32 dh, u32 dl)
+static void vct_uart_set_baud_rate(u32 address, u32 dh, u32 dl)
 {
 	u32 val = __raw_readl(UART_1_BASE + UART_LCR_OFF);
 
@@ -74,7 +78,7 @@ static void vcth_uart_set_baud_rate(u32 address, u32 dh, u32 dl)
 int serial_init(void)
 {
 	__raw_writel(UART_DIS_ALL_INTER, UART_1_BASE + UART_IER_OFF);
-	vcth_uart_set_baud_rate(UART_1_BASE, 0, UART_115200_BDR);
+	vct_uart_set_baud_rate(UART_1_BASE, 0, UART_115200_BDR);
 	__raw_writel(UART_8DATA_BITS, UART_1_BASE + UART_LCR_OFF);
 
 	return 0;
-- 
1.6.0.5

[U-Boot] [PATCH] serial: Rename driver vcth to vct to support other board variants

[Wolfgang Denk]

Dear Stefan Roese,

In message <1229352012-28442-1-git-send-email-sr@denx.de> you wrote:
> Moved driver vcth.c to vct.c to better reflect the VCT board series.
> This driver is now used by the VCT platforms:
> 
> vct_premium
> vct_platinum
> vct_platinumsvc
> 
> Signed-off-by: Stefan Roese <sr@denx.de>
> ---
>  drivers/serial/Makefile          |    2 +-
>  drivers/serial/{vcth.c => vct.c} |    8 ++++++--
>  2 files changed, 7 insertions(+), 3 deletions(-)
>  rename drivers/serial/{vcth.c => vct.c} (94%)

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
For every complex problem, there is a solution that is simple,  neat,
and wrong.                                           -- H. L. Mencken