diff mbox

[U-Boot,PATCHv2,1/4] p101x: extra init for u8500

Message ID 1301761196-26072-2-git-send-email-john.rigby@linaro.org
State Changes Requested
Headers show

Commit Message

John Rigby April 2, 2011, 4:19 p.m. UTC 
From: Rabin Vincent <rabin.vincent@stericsson.com>

empty fifo on init
program receive line control register on u8500

Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
---
v2: no changes

 drivers/serial/serial_pl01x.c |   10 ++++++++++
 drivers/serial/serial_pl01x.h |    4 ++++
 2 files changed, 14 insertions(+), 0 deletions(-)

Comments

Wolfgang Denk April 11, 2011, 5:48 p.m. UTC | #1 
Dear John Rigby,

In message <1301761196-26072-2-git-send-email-john.rigby@linaro.org> you wrote:
> From: Rabin Vincent <rabin.vincent@stericsson.com>
> 
> empty fifo on init
> program receive line control register on u8500
> 
> Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
> ---
> v2: no changes
> 
>  drivers/serial/serial_pl01x.c |   10 ++++++++++
>  drivers/serial/serial_pl01x.h |    4 ++++
>  2 files changed, 14 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c
> index 5dfcde8..22ada8f 100644
> --- a/drivers/serial/serial_pl01x.c
> +++ b/drivers/serial/serial_pl01x.c
> @@ -112,6 +112,12 @@ int serial_init (void)
>  	unsigned int remainder;
>  	unsigned int fraction;
>  
> +	/* Empty RX fifo if necessary */
> +	if (readl(&regs->pl011_cr) & UART_PL011_CR_UARTEN) {
> +		while (!(readl(&regs->fr) & UART_PL01x_FR_RXFE))
> +			readl(&regs->dr);
> +	}

Does this affect other boards?


> +#ifdef CONFIG_U8500
> +	/* program receive line control register */
> +	writel(0x70, &regs->pl011_rlcr);
> +#endif

I would like to keep board specific code out of this file.

Can you identifiy under which speific circumstances this code is
needed, and add a feature-specific ifdef instead of a board specific
one?

> --- a/drivers/serial/serial_pl01x.h
> +++ b/drivers/serial/serial_pl01x.h
> @@ -43,7 +43,11 @@ struct pl01x_regs {
>  	u32	pl010_lcrl;	/* 0x10 Line control register, low byte */
>  	u32	pl010_cr;	/* 0x14 Control register */
>  	u32	fr;		/* 0x18 Flag register (Read only) */
> +#ifdef CONFIG_U8500
> +	u32	pl011_rlcr;	/* 0x1c Receive line control register */
> +#else
>  	u32	reserved;
> +#endif

Ditto.

Best regards,

Wolfgang Denk
diff mbox

Patch

diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c
index 5dfcde8..22ada8f 100644
--- a/drivers/serial/serial_pl01x.c
+++ b/drivers/serial/serial_pl01x.c
@@ -112,6 +112,12 @@  int serial_init (void)
 	unsigned int remainder;
 	unsigned int fraction;
 
+	/* Empty RX fifo if necessary */
+	if (readl(&regs->pl011_cr) & UART_PL011_CR_UARTEN) {
+		while (!(readl(&regs->fr) & UART_PL01x_FR_RXFE))
+			readl(&regs->dr);
+	}
+
 	/* First, disable everything */
 	writel(0, &regs->pl011_cr);
 
@@ -134,6 +140,10 @@  int serial_init (void)
 	writel(UART_PL011_LCRH_WLEN_8 | UART_PL011_LCRH_FEN,
 	       &regs->pl011_lcrh);
 
+#ifdef CONFIG_U8500
+	/* program receive line control register */
+	writel(0x70, &regs->pl011_rlcr);
+#endif
 	/* Finally, enable the UART */
 	writel(UART_PL011_CR_UARTEN | UART_PL011_CR_TXE | UART_PL011_CR_RXE,
 	       &regs->pl011_cr);
diff --git a/drivers/serial/serial_pl01x.h b/drivers/serial/serial_pl01x.h
index b670c24..fdd3911 100644
--- a/drivers/serial/serial_pl01x.h
+++ b/drivers/serial/serial_pl01x.h
@@ -43,7 +43,11 @@  struct pl01x_regs {
 	u32	pl010_lcrl;	/* 0x10 Line control register, low byte */
 	u32	pl010_cr;	/* 0x14 Control register */
 	u32	fr;		/* 0x18 Flag register (Read only) */
+#ifdef CONFIG_U8500
+	u32	pl011_rlcr;	/* 0x1c Receive line control register */
+#else
 	u32	reserved;
+#endif
 	u32	ilpr;		/* 0x20 IrDA low-power counter register */
 	u32	pl011_ibrd;	/* 0x24 Integer baud rate register */
 	u32	pl011_fbrd;	/* 0x28 Fractional baud rate register */