diff options
| author | Tom Rini <trini@konsulko.com> | 2017-02-08 21:24:44 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-02-08 21:24:44 (GMT) |
| commit | 21342d4aed6c77a4aa7a5b2579b3c23e21aea31a (patch) | |
| tree | 279c781bdcbe697257ff86714fa0355bcd92fd19 /drivers/serial/ns16550.c | |
| parent | 7582ddce132390fba10822c5977cd1ab532bb1eb (diff) | |
| parent | f11a0af713a714ee2efcd810dd81c6dfd59381aa (diff) | |
| download | u-boot-fsl-qoriq-21342d4aed6c77a4aa7a5b2579b3c23e21aea31a.tar.xz | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'drivers/serial/ns16550.c')
| -rw-r--r-- | drivers/serial/ns16550.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c index 2df4a1f..1f819d4 100644 --- a/drivers/serial/ns16550.c +++ b/drivers/serial/ns16550.c @@ -383,13 +383,13 @@ int ns16550_serial_ofdata_to_platdata(struct udevice *dev) int ret; /* we prefer to use a memory-mapped register */ - ret = fdtdec_get_pci_addr(gd->fdt_blob, dev->of_offset, + ret = fdtdec_get_pci_addr(gd->fdt_blob, dev_of_offset(dev), FDT_PCI_SPACE_MEM32, "reg", &pci_addr); if (ret) { /* try if there is any i/o-mapped register */ ret = fdtdec_get_pci_addr(gd->fdt_blob, - dev->of_offset, + dev_of_offset(dev), FDT_PCI_SPACE_IO, "reg", &pci_addr); if (ret) @@ -413,9 +413,9 @@ int ns16550_serial_ofdata_to_platdata(struct udevice *dev) plat->base = (unsigned long)map_physmem(addr, 0, MAP_NOCACHE); #endif - plat->reg_offset = fdtdec_get_int(gd->fdt_blob, dev->of_offset, + plat->reg_offset = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev), "reg-offset", 0); - plat->reg_shift = fdtdec_get_int(gd->fdt_blob, dev->of_offset, + plat->reg_shift = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev), "reg-shift", 0); err = clk_get_by_index(dev, 0, &clk); @@ -429,7 +429,7 @@ int ns16550_serial_ofdata_to_platdata(struct udevice *dev) } if (!plat->clock) - plat->clock = fdtdec_get_int(gd->fdt_blob, dev->of_offset, + plat->clock = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev), "clock-frequency", CONFIG_SYS_NS16550_CLK); if (!plat->clock) { |