diff options
| author | Tom Rini <[email protected]> | 2021-03-03 22:53:53 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-03-03 22:53:53 -0500 |
| commit | 2b82b1d26ae44ac2f43d8a87f482fe906ba863fb (patch) | |
| tree | 34016a954bbcba79b78713790480b5072828d29b /drivers/serial | |
| parent | 52ba373b7825e9feab8357065155cf43dfe2f4ff (diff) | |
| parent | 384b62c073f3aaccba0c917a8da7701a82441aec (diff) | |
Merge tag 'dm-pull-3mar21' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm
dm: Fix an obscure bug with empty of-platdata
Fixes for ns16550 base address and frequency-reading
Other minor fixes
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/ns16550.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c index b9e99babebb..cc121eee277 100644 --- a/drivers/serial/ns16550.c +++ b/drivers/serial/ns16550.c @@ -483,7 +483,7 @@ static int ns16550_serial_getinfo(struct udevice *dev, return 0; } -static int ns16550_serial_assign_base(struct ns16550_plat *plat, ulong base) +static int ns16550_serial_assign_base(struct ns16550_plat *plat, fdt_addr_t base) { if (base == FDT_ADDR_T_NONE) return -EINVAL; @@ -564,6 +564,8 @@ int ns16550_serial_of_to_plat(struct udevice *dev) if (!plat->clock) plat->clock = dev_read_u32_default(dev, "clock-frequency", CONFIG_SYS_NS16550_CLK); + if (!plat->clock) + plat->clock = CONFIG_SYS_NS16550_CLK; if (!plat->clock) { debug("ns16550 clock not defined\n"); return -EINVAL; |