From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tom Date: Sun, 28 Mar 2010 12:45:54 -0500 Subject: [U-Boot] [PATCH 7/8] pl01x: add support for Ux500 variant of pl011 In-Reply-To: <1268889038-32492-1-git-send-email-rabin.vincent@stericsson.com> References: <1268886061-6382-1-git-send-email-rabin.vincent@stericsson.com> <1268889038-32492-1-git-send-email-rabin.vincent@stericsson.com> Message-ID: <4BAF95D2.1020008@windriver.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Rabin Vincent wrote: > The Ux500 variants of the pl011 have separate LCRH registers for RX and > TX. The TX register is at the same offset as the unmodified pl011, so > we need to additionally program only the RX register. > > Acked-by: Michael Brandt > Signed-off-by: Rabin Vincent This is serial and not ARM. My opinion is that the board specific #if-def could be cleaner. Tom > --- > I have used the style of the surrounding code here. > > drivers/serial/serial_pl01x.c | 8 ++++++++ > drivers/serial/serial_pl01x.h | 1 + > 2 files changed, 9 insertions(+), 0 deletions(-) > > diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c > index c645cef..c819f1d 100644 > --- a/drivers/serial/serial_pl01x.c > +++ b/drivers/serial/serial_pl01x.c > @@ -144,6 +144,14 @@ int serial_init (void) > IO_WRITE (port[CONSOLE_PORT] + UART_PL011_LCRH, > (UART_PL011_LCRH_WLEN_8 | UART_PL011_LCRH_FEN)); > > +#ifdef CONFIG_UX500 > + /* > + * On Ux500 variants, also set up the separate LCRH for RX. > + */ > + IO_WRITE (port[CONSOLE_PORT] + UART_PL011_LCRH_RX, > + (UART_PL011_LCRH_WLEN_8 | UART_PL011_LCRH_FEN)); > +#endif > + > /* > ** Finally, enable the UART > */ > diff --git a/drivers/serial/serial_pl01x.h b/drivers/serial/serial_pl01x.h > index 5f20fdd..0ff6203 100644 > --- a/drivers/serial/serial_pl01x.h > +++ b/drivers/serial/serial_pl01x.h > @@ -93,6 +93,7 @@ > * PL011 definitions > * > */ > +#define UART_PL011_LCRH_RX 0x1C > #define UART_PL011_IBRD 0x24 > #define UART_PL011_FBRD 0x28 > #define UART_PL011_LCRH 0x2C