65 lines
2.0 KiB
Diff
65 lines
2.0 KiB
Diff
From patchwork Tue Mar 6 13:13:26 2018
|
|
Content-Type: text/plain; charset="utf-8"
|
|
MIME-Version: 1.0
|
|
Content-Transfer-Encoding: 8bit
|
|
Subject: [U-Boot,
|
|
1/2] serial_bcm283x_mu: Flush RX queue after setting baud rate
|
|
X-Patchwork-Submitter: Alexander Graf <agraf@suse.de>
|
|
X-Patchwork-Id: 882056
|
|
Message-Id: <20180306131327.61174-2-agraf@suse.de>
|
|
To: u-boot@lists.denx.de
|
|
Cc: Tom Rini <trini@konsulko.com>
|
|
Date: Tue, 6 Mar 2018 14:13:26 +0100
|
|
From: Alexander Graf <agraf@suse.de>
|
|
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
|
|
|
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: caf2233b28 ("bcm283x: Add pinctrl driver")
|
|
Reported-by: Göran Lundberg <goran@lundberg.email>
|
|
Reported-by: Peter Robinson <pbrobinson@gmail.com>
|
|
Signed-off-by: Alexander Graf <agraf@suse.de>
|
|
---
|
|
drivers/serial/serial_bcm283x_mu.c | 8 +++++++-
|
|
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/serial/serial_bcm283x_mu.c b/drivers/serial/serial_bcm283x_mu.c
|
|
index 40029fadbc..d87b44e902 100644
|
|
--- a/drivers/serial/serial_bcm283x_mu.c
|
|
+++ b/drivers/serial/serial_bcm283x_mu.c
|
|
@@ -51,6 +51,8 @@ struct bcm283x_mu_priv {
|
|
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)
|
|
{
|
|
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)
|
|
u32 divider;
|
|
|
|
if (plat->skip_init)
|
|
- return 0;
|
|
+ goto out;
|
|
|
|
divider = plat->clock / (baudrate * 8);
|
|
|
|
writel(BCM283X_MU_LCR_DATA_SIZE_8, ®s->lcr);
|
|
writel(divider - 1, ®s->baud);
|
|
|
|
+out:
|
|
+ /* Flush the RX queue - all data in there is bogus */
|
|
+ while (bcm283x_mu_serial_getc(dev) != -EAGAIN) ;
|
|
+
|
|
return 0;
|
|
}
|
|
|
|
|