Merge branch 'master' of git://git.denx.de/u-boot-rockchip

[oweals/u-boot.git] / drivers / serial / ns16550.c

diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c
index 52c52c1ad145782a9536c1b2c4c0b07c3e54186e..e0e70244ce48c6e71e6731f72c1d00cee1200519 100644 (file)
--- a/drivers/serial/ns16550.c
+++ b/drivers/serial/ns16550.c
@@ -434,10 +434,8 @@ 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(dev),
-                                    "reg-offset", 0);
-       plat->reg_shift = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev),
-                                        "reg-shift", 0);
+       plat->reg_offset = dev_read_u32_default(dev, "reg-offset", 0);
+       plat->reg_shift = dev_read_u32_default(dev, "reg-shift", 0);
 
        err = clk_get_by_index(dev, 0, &clk);
        if (!err) {
@@ -450,9 +448,8 @@ int ns16550_serial_ofdata_to_platdata(struct udevice *dev)
        }
 
        if (!plat->clock)
-               plat->clock = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev),
-                                            "clock-frequency",
-                                            CONFIG_SYS_NS16550_CLK);
+               plat->clock = dev_read_u32_default(dev, "clock-frequency",
+                                                  CONFIG_SYS_NS16550_CLK);
        if (!plat->clock) {
                debug("ns16550 clock not defined\n");
                return -EINVAL;