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/mtd/spi | |
| 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/mtd/spi')
| -rw-r--r-- | drivers/mtd/spi/sandbox.c | 4 | ||||
| -rw-r--r-- | drivers/mtd/spi/spi_flash.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/spi/sandbox.c b/drivers/mtd/spi/sandbox.c index 4944059..36a50fe 100644 --- a/drivers/mtd/spi/sandbox.c +++ b/drivers/mtd/spi/sandbox.c @@ -516,7 +516,7 @@ int sandbox_sf_ofdata_to_platdata(struct udevice *dev) { struct sandbox_spi_flash_plat_data *pdata = dev_get_platdata(dev); const void *blob = gd->fdt_blob; - int node = dev->of_offset; + int node = dev_of_offset(dev); pdata->filename = fdt_getprop(blob, node, "sandbox,filename", NULL); pdata->device_name = fdt_getprop(blob, node, "compatible", NULL); @@ -641,7 +641,7 @@ int sandbox_spi_get_emul(struct sandbox_state *state, debug("%s: busnum=%u, cs=%u: binding SPI flash emulation: ", __func__, busnum, cs); ret = sandbox_sf_bind_emul(state, busnum, cs, bus, - slave->of_offset, slave->name); + dev_of_offset(slave), slave->name); if (ret) { debug("failed (err=%d)\n", ret); return ret; diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c index 2e378dc..ab7910b 100644 --- a/drivers/mtd/spi/spi_flash.c +++ b/drivers/mtd/spi/spi_flash.c @@ -919,7 +919,7 @@ int spi_flash_decode_fdt(const void *blob, struct spi_flash *flash) #ifdef CONFIG_DM_SPI_FLASH fdt_addr_t addr; fdt_size_t size; - int node = flash->dev->of_offset; + int node = dev_of_offset(flash->dev); addr = fdtdec_get_addr_size(blob, node, "memory-map", &size); if (addr == FDT_ADDR_T_NONE) { |