Merge git://git.denx.de/u-boot-fsl-qoriq

[u-boot] / drivers / serial / serial_s5p.c

diff --git a/drivers/serial/serial_s5p.c b/drivers/serial/serial_s5p.c
index 622547951e69cf57353dacab151b9b4ecbfb7c5d..a2f692bf0532fdaf35427dc4187d6f50c5763507 100644 (file)
--- a/drivers/serial/serial_s5p.c
+++ b/drivers/serial/serial_s5p.c
@@ -182,12 +182,12 @@ static int s5p_serial_ofdata_to_platdata(struct udevice *dev)
        struct s5p_serial_platdata *plat = dev->platdata;
        fdt_addr_t addr;
 
-       addr = dev_get_addr(dev);
+       addr = devfdt_get_addr(dev);
        if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;
 
        plat->reg = (struct s5p_uart *)addr;
-       plat->port_id = fdtdec_get_int(gd->fdt_blob, dev->of_offset,
+       plat->port_id = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev),
                                        "id", dev->seq);
        return 0;
 }