Merge branch 'patch/d1-serial' into allwinner

This commit is contained in:
Samuel Holland 2022-10-31 22:43:28 -05:00
commit d1a727c9cb

View File

@ -506,6 +506,7 @@ int ns16550_serial_probe(struct udevice *dev)
struct ns16550_plat *plat = dev_get_plat(dev); struct ns16550_plat *plat = dev_get_plat(dev);
struct ns16550 *const com_port = dev_get_priv(dev); struct ns16550 *const com_port = dev_get_priv(dev);
struct reset_ctl_bulk reset_bulk; struct reset_ctl_bulk reset_bulk;
struct clk_bulk clk_bulk;
fdt_addr_t addr; fdt_addr_t addr;
int ret; int ret;
@ -524,6 +525,10 @@ int ns16550_serial_probe(struct udevice *dev)
if (!ret) if (!ret)
reset_deassert_bulk(&reset_bulk); reset_deassert_bulk(&reset_bulk);
ret = clk_get_bulk(dev, &clk_bulk);
if (!ret)
clk_enable_bulk(&clk_bulk);
com_port->plat = dev_get_plat(dev); com_port->plat = dev_get_plat(dev);
ns16550_init(com_port, -1); ns16550_init(com_port, -1);