diff options
| author | Tom Rini <trini@konsulko.com> | 2018-07-10 10:29:14 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-07-10 10:29:14 -0400 |
| commit | e3396ffd720877976141fa0b76a0b8ee9643d7d1 (patch) | |
| tree | 7baee90ec8c5759a420f37a796b91fc77f69e7c7 /drivers/mtd/spi/sandbox.c | |
| parent | 495c70f9dfad1a5428ec84b52e8667ea4760ecd6 (diff) | |
| parent | 16b8d6b76992690c65c58dc8b0591496cc5e46ef (diff) | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'drivers/mtd/spi/sandbox.c')
| -rw-r--r-- | drivers/mtd/spi/sandbox.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/mtd/spi/sandbox.c b/drivers/mtd/spi/sandbox.c index f23c0e13e0..1b6c028251 100644 --- a/drivers/mtd/spi/sandbox.c +++ b/drivers/mtd/spi/sandbox.c @@ -556,7 +556,7 @@ static int sandbox_cmdline_cb_spi_sf(struct sandbox_state *state, SANDBOX_CMDLINE_OPT(spi_sf, 1, "connect a SPI flash: <bus>:<cs>:<id>:<file>"); int sandbox_sf_bind_emul(struct sandbox_state *state, int busnum, int cs, - struct udevice *bus, int of_offset, const char *spec) + struct udevice *bus, ofnode node, const char *spec) { struct udevice *emul; char name[20], *str; @@ -575,7 +575,7 @@ int sandbox_sf_bind_emul(struct sandbox_state *state, int busnum, int cs, str = strdup(name); if (!str) return -ENOMEM; - ret = device_bind(bus, drv, str, NULL, of_offset, &emul); + ret = device_bind_ofnode(bus, drv, str, NULL, node, &emul); if (ret) { free(str); printf("Cannot create emul device for spec '%s' (err=%d)\n", @@ -620,7 +620,8 @@ static int sandbox_sf_bind_bus_cs(struct sandbox_state *state, int busnum, if (ret) return ret; - return sandbox_sf_bind_emul(state, busnum, cs, bus, -1, spec); + return sandbox_sf_bind_emul(state, busnum, cs, bus, ofnode_null(), + spec); } int sandbox_spi_get_emul(struct sandbox_state *state, @@ -638,7 +639,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, - dev_of_offset(slave), slave->name); + dev_ofnode(slave), slave->name); if (ret) { debug("failed (err=%d)\n", ret); return ret; |