leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

serial: pl01x: avoid pl01x type check two times

Browse Source 
Signed-off-by: Vikas Manocha <vikas.manocha@st.com>
Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Vikas Manocha 2014-11-21 10:34:23 -08:00 committed by Tom Rini
parent f7e517b4eb
commit eb8a4fe0dc
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/serial/serial_pl01x.c
View File

@ -72,22 +72,19 @@ static int pl01x_tstc(struct pl01x_regs *regs)
static int pl01x_generic_serial_init(struct pl01x_regs *regs, static int pl01x_generic_serial_init(struct pl01x_regs *regs,
enum pl01x_type type) enum pl01x_type type)
{ {
#ifdef CONFIG_PL011_SERIAL_FLUSH_ON_INIT
if (type == TYPE_PL011) {
/* 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);
}
}
#endif
switch (type) { switch (type) {
case TYPE_PL010: case TYPE_PL010:
/* disable everything */ /* disable everything */
writel(0, &regs->pl010_cr); writel(0, &regs->pl010_cr);
break; break;
case TYPE_PL011: case TYPE_PL011:
#ifdef CONFIG_PL011_SERIAL_FLUSH_ON_INIT
/* 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);
}
#endif
/* disable everything */ /* disable everything */
writel(0, &regs->pl011_cr); writel(0, &regs->pl011_cr);
break; break;