Merge git://git.denx.de/u-boot-mips

[u-boot] / drivers / spi / ti_qspi.c

diff --git a/drivers/spi/ti_qspi.c b/drivers/spi/ti_qspi.c
index 3c4c9dd9867a9781e770cff6c3a876b4c10434a8..bea3aff943196bd3dd8415bd4addb3960534d617 100644 (file)
--- a/drivers/spi/ti_qspi.c
+++ b/drivers/spi/ti_qspi.c
@@ -574,8 +574,8 @@ static void *map_syscon_chipselects(struct udevice *bus)
                return NULL;
        }
 
-       cell = fdt_getprop(gd->fdt_blob, bus->of_offset, "syscon-chipselects",
-                          &len);
+       cell = fdt_getprop(gd->fdt_blob, dev_of_offset(bus),
+                          "syscon-chipselects", &len);
        if (len < 2*sizeof(fdt32_t)) {
                debug("%s: offset not available\n", __func__);
                return NULL;
@@ -584,7 +584,7 @@ static void *map_syscon_chipselects(struct udevice *bus)
        return fdtdec_get_number(cell + 1, 1) + regmap_get_range(regmap, 0);
 #else
        fdt_addr_t addr;
-       addr = dev_get_addr_index(bus, 2);
+       addr = devfdt_get_addr_index(bus, 2);
        return (addr == FDT_ADDR_T_NONE) ? NULL :
                map_physmem(addr, 0, MAP_NOCACHE);
 #endif
@@ -597,9 +597,9 @@ static int ti_qspi_ofdata_to_platdata(struct udevice *bus)
        int node = dev_of_offset(bus);
 
        priv->ctrl_mod_mmap = map_syscon_chipselects(bus);
-       priv->base = map_physmem(dev_get_addr(bus), sizeof(struct ti_qspi_regs),
-                                MAP_NOCACHE);
-       priv->memory_map = map_physmem(dev_get_addr_index(bus, 1), 0,
+       priv->base = map_physmem(devfdt_get_addr(bus),
+                                sizeof(struct ti_qspi_regs), MAP_NOCACHE);
+       priv->memory_map = map_physmem(devfdt_get_addr_index(bus, 1), 0,
                                       MAP_NOCACHE);
 
        priv->max_hz = fdtdec_get_int(blob, node, "spi-max-frequency", -1);