[U-Boot] [PATCH] [UPDATE] Merged serial_pl010.c and serial_pl011.c.

[U-Boot] [PATCH] [UPDATE] Merged serial_pl010.c and serial_pl011.c.

[Andreas Engel]

They only differ in the init function.
This also adds the missing watchdog support for the PL011.

Signed-off-by: Andreas Engel <andreas.engel@ericsson.com>
---
 drivers/serial/Makefile                           |    3 +-
 drivers/serial/serial_pl011.c                     |  161 ---------------------
 drivers/serial/{serial_pl010.c => serial_pl01x.c} |   83 +++++++++--
 drivers/serial/{serial_pl011.h => serial_pl01x.h} |    0
 4 files changed, 69 insertions(+), 178 deletions(-)
 delete mode 100644 drivers/serial/serial_pl011.c
 rename drivers/serial/{serial_pl010.c => serial_pl01x.c} (66%)
 rename drivers/serial/{serial_pl011.h => serial_pl01x.h} (100%)

diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index 2384735..25f13df 100644
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -32,8 +32,7 @@ COBJS-y += ns16550.o
 COBJS-$(CONFIG_DRIVER_S3C4510_UART) += s3c4510b_uart.o
 COBJS-y += serial.o
 COBJS-$(CONFIG_MAX3100_SERIAL) += serial_max3100.o
-COBJS-y += serial_pl010.o
-COBJS-y += serial_pl011.o
+COBJS-y += serial_pl01x.o
 COBJS-$(CONFIG_XILINX_UARTLITE) += serial_xuartlite.o
 COBJS-$(CONFIG_SCIF_CONSOLE) += serial_sh.o
 COBJS-$(CONFIG_USB_TTY) += usbtty.o
diff --git a/drivers/serial/serial_pl011.c b/drivers/serial/serial_pl011.c
deleted file mode 100644
index 4d35fe5..0000000
--- a/drivers/serial/serial_pl011.c
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * (C) Copyright 2000
- * Rob Taylor, Flying Pig Systems. robt at flyingpig.com.
- *
- * (C) Copyright 2004
- * ARM Ltd.
- * Philippe Robin, <philippe.robin@arm.com>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-/* Simple U-Boot driver for the PrimeCell PL011 UARTs on the IntegratorCP */
-/* Should be fairly simple to make it work with the PL010 as well */
-
-#include <common.h>
-
-#ifdef CFG_PL011_SERIAL
-
-#include "serial_pl011.h"
-
-#define IO_WRITE(addr, val) (*(volatile unsigned int *)(addr) = (val))
-#define IO_READ(addr) (*(volatile unsigned int *)(addr))
-
-/*
- * IntegratorCP has two UARTs, use the first one, at 38400-8-N-1
- * Versatile PB has four UARTs.
- */
-
-#define CONSOLE_PORT CONFIG_CONS_INDEX
-#define baudRate CONFIG_BAUDRATE
-static volatile unsigned char *const port[] = CONFIG_PL01x_PORTS;
-#define NUM_PORTS (sizeof(port)/sizeof(port[0]))
-
-static void pl011_putc (int portnum, char c);
-static int pl011_getc (int portnum);
-static int pl011_tstc (int portnum);
-
-
-int serial_init (void)
-{
-	unsigned int temp;
-	unsigned int divider;
-	unsigned int remainder;
-	unsigned int fraction;
-
-	/*
-	 ** First, disable everything.
-	 */
-	IO_WRITE (port[CONSOLE_PORT] + UART_PL011_CR, 0x0);
-
-	/*
-	 ** Set baud rate
-	 **
-	 ** IBRD = UART_CLK / (16 * BAUD_RATE)
-	 ** FBRD = ROUND((64 * MOD(UART_CLK,(16 * BAUD_RATE))) / (16 * BAUD_RATE))
-	 */
-	temp = 16 * baudRate;
-	divider = CONFIG_PL011_CLOCK / temp;
-	remainder = CONFIG_PL011_CLOCK % temp;
-	temp = (8 * remainder) / baudRate;
-	fraction = (temp >> 1) + (temp & 1);
-
-	IO_WRITE (port[CONSOLE_PORT] + UART_PL011_IBRD, divider);
-	IO_WRITE (port[CONSOLE_PORT] + UART_PL011_FBRD, fraction);
-
-	/*
-	 ** Set the UART to be 8 bits, 1 stop bit, no parity, fifo enabled.
-	 */
-	IO_WRITE (port[CONSOLE_PORT] + UART_PL011_LCRH,
-		  (UART_PL011_LCRH_WLEN_8 | UART_PL011_LCRH_FEN));
-
-	/*
-	 ** Finally, enable the UART
-	 */
-	IO_WRITE (port[CONSOLE_PORT] + UART_PL011_CR,
-		  (UART_PL011_CR_UARTEN | UART_PL011_CR_TXE |
-		   UART_PL011_CR_RXE));
-
-	return 0;
-}
-
-void serial_putc (const char c)
-{
-	if (c == '\n')
-		pl011_putc (CONSOLE_PORT, '\r');
-
-	pl011_putc (CONSOLE_PORT, c);
-}
-
-void serial_puts (const char *s)
-{
-	while (*s) {
-		serial_putc (*s++);
-	}
-}
-
-int serial_getc (void)
-{
-	return pl011_getc (CONSOLE_PORT);
-}
-
-int serial_tstc (void)
-{
-	return pl011_tstc (CONSOLE_PORT);
-}
-
-void serial_setbrg (void)
-{
-}
-
-static void pl011_putc (int portnum, char c)
-{
-	/* Wait until there is space in the FIFO */
-	while (IO_READ (port[portnum] + UART_PL01x_FR) & UART_PL01x_FR_TXFF);
-
-	/* Send the character */
-	IO_WRITE (port[portnum] + UART_PL01x_DR, c);
-}
-
-static int pl011_getc (int portnum)
-{
-	unsigned int data;
-
-	/* Wait until there is data in the FIFO */
-	while (IO_READ (port[portnum] + UART_PL01x_FR) & UART_PL01x_FR_RXFE);
-
-	data = IO_READ (port[portnum] + UART_PL01x_DR);
-
-	/* Check for an error flag */
-	if (data & 0xFFFFFF00) {
-		/* Clear the error */
-		IO_WRITE (port[portnum] + UART_PL01x_ECR, 0xFFFFFFFF);
-		return -1;
-	}
-
-	return (int) data;
-}
-
-static int pl011_tstc (int portnum)
-{
-	return !(IO_READ (port[portnum] + UART_PL01x_FR) &
-		 UART_PL01x_FR_RXFE);
-}
-
-#endif
diff --git a/drivers/serial/serial_pl010.c b/drivers/serial/serial_pl01x.c
similarity index 66%
rename from drivers/serial/serial_pl010.c
rename to drivers/serial/serial_pl01x.c
index 134ed09..d0497ec 100644
--- a/drivers/serial/serial_pl010.c
+++ b/drivers/serial/serial_pl01x.c
@@ -31,24 +31,28 @@
 #include <common.h>
 #include <watchdog.h>

-#ifdef CFG_PL010_SERIAL
+#if defined(CFG_PL010_SERIAL) || defined(CFG_PL011_SERIAL)

-#include "serial_pl011.h"
+#include "serial_pl01x.h"

 #define IO_WRITE(addr, val) (*(volatile unsigned int *)(addr) = (val))
 #define IO_READ(addr) (*(volatile unsigned int *)(addr))

-/* Integrator AP has two UARTs, we use the first one, at 38400-8-N-1 */
+/*
+ * Integrator AP has two UARTs, we use the first one, at 38400-8-N-1
+ * Integrator CP has two UARTs, use the first one, at 38400-8-N-1
+ * Versatile PB has four UARTs.
+ */
 #define CONSOLE_PORT CONFIG_CONS_INDEX
 #define baudRate CONFIG_BAUDRATE
 static volatile unsigned char *const port[] = CONFIG_PL01x_PORTS;
 #define NUM_PORTS (sizeof(port)/sizeof(port[0]))

+static void pl01x_putc (int portnum, char c);
+static int pl01x_getc (int portnum);
+static int pl01x_tstc (int portnum);

-static void pl010_putc (int portnum, char c);
-static int pl010_getc (int portnum);
-static int pl010_tstc (int portnum);
-
+#ifdef CFG_PL010_SERIAL

 int serial_init (void)
 {
@@ -103,15 +107,64 @@ int serial_init (void)
 	 */
 	IO_WRITE (port[CONSOLE_PORT] + UART_PL010_CR, (UART_PL010_CR_UARTEN));

-	return (0);
+	return 0;
 }

+#endif /* CFG_PL010_SERIAL */
+
+#ifdef CFG_PL011_SERIAL
+
+int serial_init (void)
+{
+	unsigned int temp;
+	unsigned int divider;
+	unsigned int remainder;
+	unsigned int fraction;
+
+	/*
+	 ** First, disable everything.
+	 */
+	IO_WRITE (port[CONSOLE_PORT] + UART_PL011_CR, 0x0);
+
+	/*
+	 ** Set baud rate
+	 **
+	 ** IBRD = UART_CLK / (16 * BAUD_RATE)
+	 ** FBRD = ROUND((64 * MOD(UART_CLK,(16 * BAUD_RATE))) / (16 * BAUD_RATE))
+	 */
+	temp = 16 * baudRate;
+	divider = CONFIG_PL011_CLOCK / temp;
+	remainder = CONFIG_PL011_CLOCK % temp;
+	temp = (8 * remainder) / baudRate;
+	fraction = (temp >> 1) + (temp & 1);
+
+	IO_WRITE (port[CONSOLE_PORT] + UART_PL011_IBRD, divider);
+	IO_WRITE (port[CONSOLE_PORT] + UART_PL011_FBRD, fraction);
+
+	/*
+	 ** Set the UART to be 8 bits, 1 stop bit, no parity, fifo enabled.
+	 */
+	IO_WRITE (port[CONSOLE_PORT] + UART_PL011_LCRH,
+		  (UART_PL011_LCRH_WLEN_8 | UART_PL011_LCRH_FEN));
+
+	/*
+	 ** Finally, enable the UART
+	 */
+	IO_WRITE (port[CONSOLE_PORT] + UART_PL011_CR,
+		  (UART_PL011_CR_UARTEN | UART_PL011_CR_TXE |
+		   UART_PL011_CR_RXE));
+
+	return 0;
+}
+
+#endif /* CFG_PL011_SERIAL */
+
 void serial_putc (const char c)
 {
 	if (c == '\n')
-		pl010_putc (CONSOLE_PORT, '\r');
+		pl01x_putc (CONSOLE_PORT, '\r');

-	pl010_putc (CONSOLE_PORT, c);
+	pl01x_putc (CONSOLE_PORT, c);
 }

 void serial_puts (const char *s)
@@ -123,19 +176,19 @@ void serial_puts (const char *s)

 int serial_getc (void)
 {
-	return pl010_getc (CONSOLE_PORT);
+	return pl01x_getc (CONSOLE_PORT);
 }

 int serial_tstc (void)
 {
-	return pl010_tstc (CONSOLE_PORT);
+	return pl01x_tstc (CONSOLE_PORT);
 }

 void serial_setbrg (void)
 {
 }

-static void pl010_putc (int portnum, char c)
+static void pl01x_putc (int portnum, char c)
 {
 	/* Wait until there is space in the FIFO */
 	while (IO_READ (port[portnum] + UART_PL01x_FR) & UART_PL01x_FR_TXFF)
@@ -145,7 +198,7 @@ static void pl010_putc (int portnum, char c)
 	IO_WRITE (port[portnum] + UART_PL01x_DR, c);
 }

-static int pl010_getc (int portnum)
+static int pl01x_getc (int portnum)
 {
 	unsigned int data;

@@ -165,7 +218,7 @@ static int pl010_getc (int portnum)
 	return (int) data;
 }

-static int pl010_tstc (int portnum)
+static int pl01x_tstc (int portnum)
 {
 	WATCHDOG_RESET();
 	return !(IO_READ (port[portnum] + UART_PL01x_FR) &
diff --git a/drivers/serial/serial_pl011.h b/drivers/serial/serial_pl01x.h
similarity index 100%
rename from drivers/serial/serial_pl011.h
rename to drivers/serial/serial_pl01x.h
-- 
1.5.6.5

[U-Boot] [PATCH] [UPDATE] Merged serial_pl010.c and serial_pl011.c.

[Wolfgang Denk]

Dear Andreas Engel,

In message <1219648296-29567-1-git-send-email-andreas.engel@ericsson.com> you wrote:
> They only differ in the init function.
> This also adds the missing watchdog support for the PL011.
> 
> Signed-off-by: Andreas Engel <andreas.engel@ericsson.com>
> ---
>  drivers/serial/Makefile                           |    3 +-
>  drivers/serial/serial_pl011.c                     |  161 ---------------------
>  drivers/serial/{serial_pl010.c => serial_pl01x.c} |   83 +++++++++--
>  drivers/serial/{serial_pl011.h => serial_pl01x.h} |    0
>  4 files changed, 69 insertions(+), 178 deletions(-)
>  delete mode 100644 drivers/serial/serial_pl011.c
>  rename drivers/serial/{serial_pl010.c => serial_pl01x.c} (66%)
>  rename drivers/serial/{serial_pl011.h => serial_pl01x.h} (100%)

This patch does not apply (any more?) :

Applying Merged serial_pl010.c and serial_pl011.c.
error: patch failed: drivers/serial/Makefile:32
error: drivers/serial/Makefile: patch does not apply
fatal: mode change for drivers/serial/serial_pl011.h, which is not in
current HEAD
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001.

Please rebase and resubmit. Thanks in advance.

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
The use of anthropomorphic terminology when  dealing  with  computing
systems is a symptom of professional immaturity.   -- Edsger Dijkstra

[U-Boot] [PATCH] [UPDATE #2] Merged serial_pl010.c and serial_pl011.c.

[Andreas Engel]

They only differ in the init function.
This also adds the missing watchdog support for the PL011.

Signed-off-by: Andreas Engel <andreas.engel@ericsson.com>
---

 Updated patch to the current git head as of today.

 drivers/serial/Makefile                           |    3 +-
 drivers/serial/serial_pl011.c                     |  161 ---------------------
 drivers/serial/{serial_pl010.c => serial_pl01x.c} |   83 +++++++++--
 drivers/serial/{serial_pl011.h => serial_pl01x.h} |    0
 4 files changed, 69 insertions(+), 178 deletions(-)
 delete mode 100644 drivers/serial/serial_pl011.c
 rename drivers/serial/{serial_pl010.c => serial_pl01x.c} (66%)
 rename drivers/serial/{serial_pl011.h => serial_pl01x.h} (100%)

diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index f30014d..3cc1999 100644
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -33,8 +33,7 @@ COBJS-$(CONFIG_DRIVER_S3C4510_UART) += s3c4510b_uart.o
 COBJS-$(CONFIG_S3C64XX) += s3c64xx.o
 COBJS-y += serial.o
 COBJS-$(CONFIG_MAX3100_SERIAL) += serial_max3100.o
-COBJS-y += serial_pl010.o
-COBJS-y += serial_pl011.o
+COBJS-y += serial_pl01x.o
 COBJS-$(CONFIG_XILINX_UARTLITE) += serial_xuartlite.o
 COBJS-$(CONFIG_SCIF_CONSOLE) += serial_sh.o
 COBJS-$(CONFIG_USB_TTY) += usbtty.o
diff --git a/drivers/serial/serial_pl011.c b/drivers/serial/serial_pl011.c
deleted file mode 100644
index 4d35fe5..0000000
--- a/drivers/serial/serial_pl011.c
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * (C) Copyright 2000
- * Rob Taylor, Flying Pig Systems. robt at flyingpig.com.
- *
- * (C) Copyright 2004
- * ARM Ltd.
- * Philippe Robin, <philippe.robin@arm.com>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-/* Simple U-Boot driver for the PrimeCell PL011 UARTs on the IntegratorCP */
-/* Should be fairly simple to make it work with the PL010 as well */
-
-#include <common.h>
-
-#ifdef CFG_PL011_SERIAL
-
-#include "serial_pl011.h"
-
-#define IO_WRITE(addr, val) (*(volatile unsigned int *)(addr) = (val))
-#define IO_READ(addr) (*(volatile unsigned int *)(addr))
-
-/*
- * IntegratorCP has two UARTs, use the first one, at 38400-8-N-1
- * Versatile PB has four UARTs.
- */
-
-#define CONSOLE_PORT CONFIG_CONS_INDEX
-#define baudRate CONFIG_BAUDRATE
-static volatile unsigned char *const port[] = CONFIG_PL01x_PORTS;
-#define NUM_PORTS (sizeof(port)/sizeof(port[0]))
-
-static void pl011_putc (int portnum, char c);
-static int pl011_getc (int portnum);
-static int pl011_tstc (int portnum);
-
-
-int serial_init (void)
-{
-	unsigned int temp;
-	unsigned int divider;
-	unsigned int remainder;
-	unsigned int fraction;
-
-	/*
-	 ** First, disable everything.
-	 */
-	IO_WRITE (port[CONSOLE_PORT] + UART_PL011_CR, 0x0);
-
-	/*
-	 ** Set baud rate
-	 **
-	 ** IBRD = UART_CLK / (16 * BAUD_RATE)
-	 ** FBRD = ROUND((64 * MOD(UART_CLK,(16 * BAUD_RATE))) / (16 * BAUD_RATE))
-	 */
-	temp = 16 * baudRate;
-	divider = CONFIG_PL011_CLOCK / temp;
-	remainder = CONFIG_PL011_CLOCK % temp;
-	temp = (8 * remainder) / baudRate;
-	fraction = (temp >> 1) + (temp & 1);
-
-	IO_WRITE (port[CONSOLE_PORT] + UART_PL011_IBRD, divider);
-	IO_WRITE (port[CONSOLE_PORT] + UART_PL011_FBRD, fraction);
-
-	/*
-	 ** Set the UART to be 8 bits, 1 stop bit, no parity, fifo enabled.
-	 */
-	IO_WRITE (port[CONSOLE_PORT] + UART_PL011_LCRH,
-		  (UART_PL011_LCRH_WLEN_8 | UART_PL011_LCRH_FEN));
-
-	/*
-	 ** Finally, enable the UART
-	 */
-	IO_WRITE (port[CONSOLE_PORT] + UART_PL011_CR,
-		  (UART_PL011_CR_UARTEN | UART_PL011_CR_TXE |
-		   UART_PL011_CR_RXE));
-
-	return 0;
-}
-
-void serial_putc (const char c)
-{
-	if (c == '\n')
-		pl011_putc (CONSOLE_PORT, '\r');
-
-	pl011_putc (CONSOLE_PORT, c);
-}
-
-void serial_puts (const char *s)
-{
-	while (*s) {
-		serial_putc (*s++);
-	}
-}
-
-int serial_getc (void)
-{
-	return pl011_getc (CONSOLE_PORT);
-}
-
-int serial_tstc (void)
-{
-	return pl011_tstc (CONSOLE_PORT);
-}
-
-void serial_setbrg (void)
-{
-}
-
-static void pl011_putc (int portnum, char c)
-{
-	/* Wait until there is space in the FIFO */
-	while (IO_READ (port[portnum] + UART_PL01x_FR) & UART_PL01x_FR_TXFF);
-
-	/* Send the character */
-	IO_WRITE (port[portnum] + UART_PL01x_DR, c);
-}
-
-static int pl011_getc (int portnum)
-{
-	unsigned int data;
-
-	/* Wait until there is data in the FIFO */
-	while (IO_READ (port[portnum] + UART_PL01x_FR) & UART_PL01x_FR_RXFE);
-
-	data = IO_READ (port[portnum] + UART_PL01x_DR);
-
-	/* Check for an error flag */
-	if (data & 0xFFFFFF00) {
-		/* Clear the error */
-		IO_WRITE (port[portnum] + UART_PL01x_ECR, 0xFFFFFFFF);
-		return -1;
-	}
-
-	return (int) data;
-}
-
-static int pl011_tstc (int portnum)
-{
-	return !(IO_READ (port[portnum] + UART_PL01x_FR) &
-		 UART_PL01x_FR_RXFE);
-}
-
-#endif
diff --git a/drivers/serial/serial_pl010.c b/drivers/serial/serial_pl01x.c
similarity index 66%
rename from drivers/serial/serial_pl010.c
rename to drivers/serial/serial_pl01x.c
index 134ed09..d0497ec 100644
--- a/drivers/serial/serial_pl010.c
+++ b/drivers/serial/serial_pl01x.c
@@ -31,24 +31,28 @@
 #include <common.h>
 #include <watchdog.h>

-#ifdef CFG_PL010_SERIAL
+#if defined(CFG_PL010_SERIAL) || defined(CFG_PL011_SERIAL)

-#include "serial_pl011.h"
+#include "serial_pl01x.h"

 #define IO_WRITE(addr, val) (*(volatile unsigned int *)(addr) = (val))
 #define IO_READ(addr) (*(volatile unsigned int *)(addr))

-/* Integrator AP has two UARTs, we use the first one, at 38400-8-N-1 */
+/*
+ * Integrator AP has two UARTs, we use the first one, at 38400-8-N-1
+ * Integrator CP has two UARTs, use the first one, at 38400-8-N-1
+ * Versatile PB has four UARTs.
+ */
 #define CONSOLE_PORT CONFIG_CONS_INDEX
 #define baudRate CONFIG_BAUDRATE
 static volatile unsigned char *const port[] = CONFIG_PL01x_PORTS;
 #define NUM_PORTS (sizeof(port)/sizeof(port[0]))

+static void pl01x_putc (int portnum, char c);
+static int pl01x_getc (int portnum);
+static int pl01x_tstc (int portnum);

-static void pl010_putc (int portnum, char c);
-static int pl010_getc (int portnum);
-static int pl010_tstc (int portnum);
-
+#ifdef CFG_PL010_SERIAL

 int serial_init (void)
 {
@@ -103,15 +107,64 @@ int serial_init (void)
 	 */
 	IO_WRITE (port[CONSOLE_PORT] + UART_PL010_CR, (UART_PL010_CR_UARTEN));

-	return (0);
+	return 0;
 }

+#endif /* CFG_PL010_SERIAL */
+
+#ifdef CFG_PL011_SERIAL
+
+int serial_init (void)
+{
+	unsigned int temp;
+	unsigned int divider;
+	unsigned int remainder;
+	unsigned int fraction;
+
+	/*
+	 ** First, disable everything.
+	 */
+	IO_WRITE (port[CONSOLE_PORT] + UART_PL011_CR, 0x0);
+
+	/*
+	 ** Set baud rate
+	 **
+	 ** IBRD = UART_CLK / (16 * BAUD_RATE)
+	 ** FBRD = ROUND((64 * MOD(UART_CLK,(16 * BAUD_RATE))) / (16 * BAUD_RATE))
+	 */
+	temp = 16 * baudRate;
+	divider = CONFIG_PL011_CLOCK / temp;
+	remainder = CONFIG_PL011_CLOCK % temp;
+	temp = (8 * remainder) / baudRate;
+	fraction = (temp >> 1) + (temp & 1);
+
+	IO_WRITE (port[CONSOLE_PORT] + UART_PL011_IBRD, divider);
+	IO_WRITE (port[CONSOLE_PORT] + UART_PL011_FBRD, fraction);
+
+	/*
+	 ** Set the UART to be 8 bits, 1 stop bit, no parity, fifo enabled.
+	 */
+	IO_WRITE (port[CONSOLE_PORT] + UART_PL011_LCRH,
+		  (UART_PL011_LCRH_WLEN_8 | UART_PL011_LCRH_FEN));
+
+	/*
+	 ** Finally, enable the UART
+	 */
+	IO_WRITE (port[CONSOLE_PORT] + UART_PL011_CR,
+		  (UART_PL011_CR_UARTEN | UART_PL011_CR_TXE |
+		   UART_PL011_CR_RXE));
+
+	return 0;
+}
+
+#endif /* CFG_PL011_SERIAL */
+
 void serial_putc (const char c)
 {
 	if (c == '\n')
-		pl010_putc (CONSOLE_PORT, '\r');
+		pl01x_putc (CONSOLE_PORT, '\r');

-	pl010_putc (CONSOLE_PORT, c);
+	pl01x_putc (CONSOLE_PORT, c);
 }

 void serial_puts (const char *s)
@@ -123,19 +176,19 @@ void serial_puts (const char *s)

 int serial_getc (void)
 {
-	return pl010_getc (CONSOLE_PORT);
+	return pl01x_getc (CONSOLE_PORT);
 }

 int serial_tstc (void)
 {
-	return pl010_tstc (CONSOLE_PORT);
+	return pl01x_tstc (CONSOLE_PORT);
 }

 void serial_setbrg (void)
 {
 }

-static void pl010_putc (int portnum, char c)
+static void pl01x_putc (int portnum, char c)
 {
 	/* Wait until there is space in the FIFO */
 	while (IO_READ (port[portnum] + UART_PL01x_FR) & UART_PL01x_FR_TXFF)
@@ -145,7 +198,7 @@ static void pl010_putc (int portnum, char c)
 	IO_WRITE (port[portnum] + UART_PL01x_DR, c);
 }

-static int pl010_getc (int portnum)
+static int pl01x_getc (int portnum)
 {
 	unsigned int data;

@@ -165,7 +218,7 @@ static int pl010_getc (int portnum)
 	return (int) data;
 }

-static int pl010_tstc (int portnum)
+static int pl01x_tstc (int portnum)
 {
 	WATCHDOG_RESET();
 	return !(IO_READ (port[portnum] + UART_PL01x_FR) &
diff --git a/drivers/serial/serial_pl011.h b/drivers/serial/serial_pl01x.h
similarity index 100%
rename from drivers/serial/serial_pl011.h
rename to drivers/serial/serial_pl01x.h
-- 
1.5.6.5

[U-Boot] [PATCH] [UPDATE #2] Merged serial_pl010.c and serial_pl011.c.

[Jean-Christophe PLAGNIOL-VILLARD]

On 10:17 Mon 08 Sep     , Andreas Engel wrote:
> They only differ in the init function.
> This also adds the missing watchdog support for the PL011.
> 
> Signed-off-by: Andreas Engel <andreas.engel@ericsson.com>
> ---
> 
>  Updated patch to the current git head as of today.
> 
>  drivers/serial/Makefile                           |    3 +-
>  drivers/serial/serial_pl011.c                     |  161 ---------------------
>  drivers/serial/{serial_pl010.c => serial_pl01x.c} |   83 +++++++++--
>  drivers/serial/{serial_pl011.h => serial_pl01x.h} |    0
>  4 files changed, 69 insertions(+), 178 deletions(-)
>  delete mode 100644 drivers/serial/serial_pl011.c
>  rename drivers/serial/{serial_pl010.c => serial_pl01x.c} (66%)
>  rename drivers/serial/{serial_pl011.h => serial_pl01x.h} (100%)
> 
> diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
> index f30014d..3cc1999 100644
> --- a/drivers/serial/Makefile
> +++ b/drivers/serial/Makefile
> @@ -33,8 +33,7 @@ COBJS-$(CONFIG_DRIVER_S3C4510_UART) += s3c4510b_uart.o
>  COBJS-$(CONFIG_S3C64XX) += s3c64xx.o
>  COBJS-y += serial.o
>  COBJS-$(CONFIG_MAX3100_SERIAL) += serial_max3100.o
> -COBJS-y += serial_pl010.o
> -COBJS-y += serial_pl011.o
> +COBJS-y += serial_pl01x.o
>  COBJS-$(CONFIG_XILINX_UARTLITE) += serial_xuartlite.o
>  COBJS-$(CONFIG_SCIF_CONSOLE) += serial_sh.o
>  COBJS-$(CONFIG_USB_TTY) += usbtty.o
> diff --git a/drivers/serial/serial_pl011.c b/drivers/serial/serial_pl011.c
> deleted file mode 100644
> index 4d35fe5..0000000
> --- a/drivers/serial/serial_pl011.c
> +++ /dev/null
> @@ -1,161 +0,0 @@
> -/*
> - * (C) Copyright 2000
> - * Rob Taylor, Flying Pig Systems. robt at flyingpig.com.
> - *
> - * (C) Copyright 2004
> - * ARM Ltd.
> - * Philippe Robin, <philippe.robin@arm.com>
> - *
> - * See file CREDITS for list of people who contributed to this
> - * project.
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public License as
> - * published by the Free Software Foundation; either version 2 of
> - * the License, or (at your option) any later version.
> +++ b/drivers/serial/serial_pl01x.c
> @@ -31,24 +31,28 @@
>  #include <common.h>
>  #include <watchdog.h>
> 
> -#ifdef CFG_PL010_SERIAL
> +#if defined(CFG_PL010_SERIAL) || defined(CFG_PL011_SERIAL)
Please move this to the Makefile

Best Regards,
J.

[U-Boot] [PATCH] [UPDATE #2] Merged serial_pl010.c and serial_pl011.c.

[Andreas Engel]

Jean-Christophe PLAGNIOL-VILLARD wrote:
> On 10:17 Mon 08 Sep     , Andreas Engel wrote:
>> [...]
>>
>> -#ifdef CFG_PL010_SERIAL
>> +#if defined(CFG_PL010_SERIAL) || defined(CFG_PL011_SERIAL)
> Please move this to the Makefile

Shouldn't this better be a separate patch?

Regards,
  Andreas

[U-Boot] [PATCH] [UPDATE #2] Merged serial_pl010.c and serial_pl011.c.

[Wolfgang Denk]

Dear Andreas Engel,

In message <48C4F061.1090609@ericsson.com> you wrote:
> Jean-Christophe PLAGNIOL-VILLARD wrote:
> > On 10:17 Mon 08 Sep     , Andreas Engel wrote:
> >> [...]
> >>
> >> -#ifdef CFG_PL010_SERIAL
> >> +#if defined(CFG_PL010_SERIAL) || defined(CFG_PL011_SERIAL)
> > Please move this to the Makefile
> 
> Shouldn't this better be a separate patch?

Yes, indeed.

Thanks in advance.

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
You have the capacity to learn from  mistakes.  You'll  learn  a  lot
today.

[U-Boot] [PATCH] [ARM] Moved conditional compile into Makefile

[Andreas Engel]

Signed-off-by: Andreas Engel <andreas.engel@ericsson.com>
---
 README                         |    4 ++--
 drivers/serial/Makefile        |    3 ++-
 drivers/serial/serial_pl01x.c  |   15 +++++----------
 include/configs/integratorap.h |    2 +-
 include/configs/integratorcp.h |    2 +-
 include/configs/versatile.h    |    2 +-
 6 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/README b/README
index 37449d1..4daff33 100644
--- a/README
+++ b/README
@@ -380,11 +380,11 @@ The following options need to be configured:
 		param header, the default value is zero if undefined.

 - Serial Ports:
-		CFG_PL010_SERIAL
+		CONFIG_PL010_SERIAL

 		Define this if you want support for Amba PrimeCell PL010 UARTs.

-		CFG_PL011_SERIAL
+		CONFIG_PL011_SERIAL

 		Define this if you want support for Amba PrimeCell PL011 UARTs.

diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index 3cc1999..b370828 100644
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -33,7 +33,8 @@ COBJS-$(CONFIG_DRIVER_S3C4510_UART) += s3c4510b_uart.o
 COBJS-$(CONFIG_S3C64XX) += s3c64xx.o
 COBJS-y += serial.o
 COBJS-$(CONFIG_MAX3100_SERIAL) += serial_max3100.o
-COBJS-y += serial_pl01x.o
+COBJS-$(CONFIG_PL010_SERIAL) += serial_pl01x.o
+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
diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c
index d0497ec..c645cef 100644
--- a/drivers/serial/serial_pl01x.c
+++ b/drivers/serial/serial_pl01x.c
@@ -25,14 +25,11 @@
  * MA 02111-1307 USA
  */

-/* Simple U-Boot driver for the PrimeCell PL011 UARTs on the IntegratorCP */
-/* Should be fairly simple to make it work with the PL010 as well */
+/* Simple U-Boot driver for the PrimeCell PL010/PL011 UARTs */

 #include <common.h>
 #include <watchdog.h>

-#if defined(CFG_PL010_SERIAL) || defined(CFG_PL011_SERIAL)
-
 #include "serial_pl01x.h"

 #define IO_WRITE(addr, val) (*(volatile unsigned int *)(addr) = (val))
@@ -52,7 +49,7 @@ static void pl01x_putc (int portnum, char c);
 static int pl01x_getc (int portnum);
 static int pl01x_tstc (int portnum);

-#ifdef CFG_PL010_SERIAL
+#ifdef CONFIG_PL010_SERIAL

 int serial_init (void)
 {
@@ -110,9 +107,9 @@ int serial_init (void)
 	return 0;
 }

-#endif /* CFG_PL010_SERIAL */
+#endif /* CONFIG_PL010_SERIAL */

-#ifdef CFG_PL011_SERIAL
+#ifdef CONFIG_PL011_SERIAL

 int serial_init (void)
 {
@@ -157,7 +154,7 @@ int serial_init (void)
 	return 0;
 }

-#endif /* CFG_PL011_SERIAL */
+#endif /* CONFIG_PL011_SERIAL */

 void serial_putc (const char c)
 {
@@ -224,5 +221,3 @@ static int pl01x_tstc (int portnum)
 	return !(IO_READ (port[portnum] + UART_PL01x_FR) &
 		 UART_PL01x_FR_RXFE);
 }
-
-#endif
diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h
index 1452bf2..ba3c531 100644
--- a/include/configs/integratorap.h
+++ b/include/configs/integratorap.h
@@ -58,7 +58,7 @@
 /*
  * PL010 Configuration
  */
-#define CFG_PL010_SERIAL
+#define CONFIG_PL010_SERIAL
 #define CONFIG_CONS_INDEX	0
 #define CONFIG_BAUDRATE		38400
 #define CONFIG_PL01x_PORTS	{ (void *) (CFG_SERIAL0), (void *) (CFG_SERIAL1) }
diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h
index 347fa02..5340f7c 100644
--- a/include/configs/integratorcp.h
+++ b/include/configs/integratorcp.h
@@ -61,7 +61,7 @@
 /*
  * NS16550 Configuration
  */
-#define CFG_PL011_SERIAL
+#define CONFIG_PL011_SERIAL
 #define CONFIG_PL011_CLOCK	14745600
 #define CONFIG_PL01x_PORTS	{ (void *)CFG_SERIAL0, (void *)CFG_SERIAL1 }
 #define CONFIG_CONS_INDEX	0
diff --git a/include/configs/versatile.h b/include/configs/versatile.h
index a88d356..c18a248 100644
--- a/include/configs/versatile.h
+++ b/include/configs/versatile.h
@@ -86,7 +86,7 @@
 /*
  * NS16550 Configuration
  */
-#define CFG_PL011_SERIAL
+#define CONFIG_PL011_SERIAL
 #define CONFIG_PL011_CLOCK	24000000
 #define CONFIG_PL01x_PORTS	{ (void *)CFG_SERIAL0, (void *)CFG_SERIAL1 }
 #define CONFIG_CONS_INDEX	0
-- 
1.5.6.5

[U-Boot] [PATCH] [ARM] Moved conditional compile into Makefile

[Jean-Christophe PLAGNIOL-VILLARD]

On 14:30 Mon 08 Sep     , Andreas Engel wrote:
> 
> Signed-off-by: Andreas Engel <andreas.engel@ericsson.com>
> ---
>  README                         |    4 ++--
>  drivers/serial/Makefile        |    3 ++-
>  drivers/serial/serial_pl01x.c  |   15 +++++----------
>  include/configs/integratorap.h |    2 +-
>  include/configs/integratorcp.h |    2 +-
>  include/configs/versatile.h    |    2 +-
>  6 files changed, 12 insertions(+), 16 deletions(-)
> 
> diff --git a/README b/README
> index 37449d1..4daff33 100644
> --- a/README
> +++ b/README
> @@ -380,11 +380,11 @@ The following options need to be configured:
>  		param header, the default value is zero if undefined.
> 
>  - Serial Ports:
> -		CFG_PL010_SERIAL
> +		CONFIG_PL010_SERIAL
> 
>  		Define this if you want support for Amba PrimeCell PL010 UARTs.
> 
> -		CFG_PL011_SERIAL
> +		CONFIG_PL011_SERIAL
> 
>  		Define this if you want support for Amba PrimeCell PL011 UARTs.
> 
> diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
> index 3cc1999..b370828 100644
> --- a/drivers/serial/Makefile
> +++ b/drivers/serial/Makefile
> @@ -33,7 +33,8 @@ COBJS-$(CONFIG_DRIVER_S3C4510_UART) += s3c4510b_uart.o
>  COBJS-$(CONFIG_S3C64XX) += s3c64xx.o
>  COBJS-y += serial.o
>  COBJS-$(CONFIG_MAX3100_SERIAL) += serial_max3100.o
> -COBJS-y += serial_pl01x.o
> +COBJS-$(CONFIG_PL010_SERIAL) += serial_pl01x.o
> +COBJS-$(CONFIG_PL011_SERIAL) += serial_pl01x.o

what append if CONFIG_PL010_SERIAL and CONFIG_PL011_SERIAL is active at the
same time?

serial_pl01x.c will be compile twice

so please move to 
+COBJS-$(CONFIG_PL010_SERIAL)$(CONFIG_PL011_SERIAL) += serial_pl01x.o

Best Regards,
J.

[U-Boot] [PATCH] [ARM] Moved conditional compile into Makefile

[Wolfgang Denk]

Dear Jean-Christophe PLAGNIOL-VILLARD,

In message <20080908133035.GB3956@game.jcrosoft.org> you wrote:
>
> what append if CONFIG_PL010_SERIAL and CONFIG_PL011_SERIAL is active at the
> same time?

Then something is missing.

> serial_pl01x.c will be compile twice
> 
> so please move to 
> +COBJS-$(CONFIG_PL010_SERIAL)$(CONFIG_PL011_SERIAL) += serial_pl01x.o

This alone is not sufficient, since then you need to add a  rule  for
the resulting COBJS-yy.

But as I learned all of this is completely unnecessary.

As Detlev Zundel pointed out, just doing "COBJS-y = $(sort COBJS-y)"
would fix any such problems in a clean and readable way.

I recommend to add such a statement instead.

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
Do you know about being with somebody? Wanting to be? If  I  had  the
whole  universe,  I'd  give it to you, Janice. When I see you, I feel
like I'm hungry all over. Do you know how that feels?
	-- Charlie Evans, "Charlie X", stardate 1535.8

[U-Boot] [PATCH] [ARM] Moved conditional compile into Makefile

[Andreas Engel]

Wolfgang Denk schrieb:
> Dear Jean-Christophe PLAGNIOL-VILLARD,
> 
> In message <20080908133035.GB3956@game.jcrosoft.org> you wrote:
>> what append if CONFIG_PL010_SERIAL and CONFIG_PL011_SERIAL is active at the
>> same time?
> 
> Then something is missing.

In this particular case, this will not work anyway. The driver is not prepared
to support both a PL010 and a PL011 at the same time. And I doubt that there's
some real hardware out there which actually contains both types of uarts.

>> serial_pl01x.c will be compile twice
>>
>> so please move to 
>> +COBJS-$(CONFIG_PL010_SERIAL)$(CONFIG_PL011_SERIAL) += serial_pl01x.o
> 
> This alone is not sufficient, since then you need to add a  rule  for
> the resulting COBJS-yy.

There's already such a rule in common/Makefile.

> But as I learned all of this is completely unnecessary.
> 
> As Detlev Zundel pointed out, just doing "COBJS-y = $(sort COBJS-y)"
> would fix any such problems in a clean and readable way.
> 
> I recommend to add such a statement instead.

Yes, that's definitely better, as it also catches cases with more than
two y's.

Regards,
  Andreas

[U-Boot] [PATCH] [UPDATE #2] Merged serial_pl010.c and serial_pl011.c.

[Wolfgang Denk]

Dear Andreas Engel,

In message <1220861851-25043-1-git-send-email-andreas.engel@ericsson.com> you wrote:
> They only differ in the init function.
> This also adds the missing watchdog support for the PL011.
> 
> Signed-off-by: Andreas Engel <andreas.engel@ericsson.com>
> ---
> 
>  Updated patch to the current git head as of today.
> 
>  drivers/serial/Makefile                           |    3 +-
>  drivers/serial/serial_pl011.c                     |  161 ---------------------
>  drivers/serial/{serial_pl010.c => serial_pl01x.c} |   83 +++++++++--
>  drivers/serial/{serial_pl011.h => serial_pl01x.h} |    0
>  4 files changed, 69 insertions(+), 178 deletions(-)
>  delete mode 100644 drivers/serial/serial_pl011.c
>  rename drivers/serial/{serial_pl010.c => serial_pl01x.c} (66%)
>  rename drivers/serial/{serial_pl011.h => serial_pl01x.h} (100%)

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
"A witty saying proves nothing."                           - Voltaire