diff options
| author | Alexander Graf <agraf@suse.de> | 2018-03-08 00:08:25 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-03-09 20:31:04 +0300 |
| commit | c9bf43dd9d49c5024a9a361b5168ef664186c22a (patch) | |
| tree | 45647f78f24d9a6dc710292d143571d0629c687c /drivers/serial/serial_bcm283x_pl011.c | |
| parent | 293b9814d760aa736fb4dc6cf0a579aa431282f6 (diff) | |
| download | u-boot-c9bf43dd9d49c5024a9a361b5168ef664186c22a.tar.xz | |
bcm283x_pl011: 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 on Raspberry Pis that use pl011 for serial.
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>
Tested-by: Peter Robinson <pbrobinson@gmail.com>
Tested-by: Tuomas Tynkkynen <tuomas@tuxera.com>
Diffstat (limited to 'drivers/serial/serial_bcm283x_pl011.c')
| -rw-r--r-- | drivers/serial/serial_bcm283x_pl011.c | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/drivers/serial/serial_bcm283x_pl011.c b/drivers/serial/serial_bcm283x_pl011.c index bfd39f84f3..dad7236895 100644 --- a/drivers/serial/serial_bcm283x_pl011.c +++ b/drivers/serial/serial_bcm283x_pl011.c @@ -9,6 +9,7 @@ #include <asm/gpio.h> #include <dm/pinctrl.h> #include <dm/platform_data/serial_pl01x.h> +#include <serial.h> #include "serial_pl01x_internal.h" /* @@ -55,6 +56,28 @@ static int bcm283x_pl011_serial_ofdata_to_platdata(struct udevice *dev) return 0; } +static int bcm283x_pl011_serial_setbrg(struct udevice *dev, int baudrate) +{ + int r; + + r = pl01x_serial_setbrg(dev, baudrate); + + /* + * We may have been muxed to a bogus line before. Drain the RX + * queue so we start at a clean slate. + */ + while (pl01x_serial_getc(dev) != -EAGAIN) ; + + return r; +} + +static const struct dm_serial_ops bcm283x_pl011_serial_ops = { + .putc = pl01x_serial_putc, + .pending = pl01x_serial_pending, + .getc = pl01x_serial_getc, + .setbrg = bcm283x_pl011_serial_setbrg, +}; + static const struct udevice_id bcm283x_pl011_serial_id[] = { {.compatible = "brcm,bcm2835-pl011", .data = TYPE_PL011}, {} @@ -67,7 +90,7 @@ U_BOOT_DRIVER(bcm283x_pl011_uart) = { .ofdata_to_platdata = of_match_ptr(bcm283x_pl011_serial_ofdata_to_platdata), .platdata_auto_alloc_size = sizeof(struct pl01x_serial_platdata), .probe = pl01x_serial_probe, - .ops = &pl01x_serial_ops, + .ops = &bcm283x_pl011_serial_ops, .flags = DM_FLAG_PRE_RELOC, .priv_auto_alloc_size = sizeof(struct pl01x_priv), }; |