Skip to content
Snippets Groups Projects
Commit 293b9814 authored by Alexander Graf's avatar Alexander Graf Committed by Tom Rini
Browse files

serial_bcm283x_mu: Flush RX queue after setting baud rate


After the UART was initialized, we may still have bogus data in the
RX queue if it was enabled with incorrect pin muxing before.

So let's flush the RX queue whenever we initialize baud rates.

This fixes a regression with the dynamic pinmuxing code when enable_uart=1
is not set in config.txt.

Fixes: caf2233b ("bcm283x: Add pinctrl driver")
Reported-by: default avatarGöran Lundberg <goran@lundberg.email>
Reported-by: default avatarPeter Robinson <pbrobinson@gmail.com>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
Tested-by: default avatarPeter Robinson <pbrobinson@gmail.com>
Tested-by: default avatarTuomas Tynkkynen <tuomas@tuxera.com>
parent b996b7d4
No related branches found
No related tags found
No related merge requests found
...@@ -51,6 +51,8 @@ struct bcm283x_mu_priv { ...@@ -51,6 +51,8 @@ struct bcm283x_mu_priv {
struct bcm283x_mu_regs *regs; struct bcm283x_mu_regs *regs;
}; };
static int bcm283x_mu_serial_getc(struct udevice *dev);
static int bcm283x_mu_serial_setbrg(struct udevice *dev, int baudrate) static int bcm283x_mu_serial_setbrg(struct udevice *dev, int baudrate)
{ {
struct bcm283x_mu_serial_platdata *plat = dev_get_platdata(dev); struct bcm283x_mu_serial_platdata *plat = dev_get_platdata(dev);
...@@ -59,13 +61,17 @@ static int bcm283x_mu_serial_setbrg(struct udevice *dev, int baudrate) ...@@ -59,13 +61,17 @@ static int bcm283x_mu_serial_setbrg(struct udevice *dev, int baudrate)
u32 divider; u32 divider;
if (plat->skip_init) if (plat->skip_init)
return 0; goto out;
divider = plat->clock / (baudrate * 8); divider = plat->clock / (baudrate * 8);
writel(BCM283X_MU_LCR_DATA_SIZE_8, &regs->lcr); writel(BCM283X_MU_LCR_DATA_SIZE_8, &regs->lcr);
writel(divider - 1, &regs->baud); writel(divider - 1, &regs->baud);
out:
/* Flush the RX queue - all data in there is bogus */
while (bcm283x_mu_serial_getc(dev) != -EAGAIN) ;
return 0; return 0;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment