diff options
| author | Tom Rini <trini@konsulko.com> | 2015-10-27 19:08:19 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-10-27 19:08:19 -0400 |
| commit | 2431492aef1de33bd222c97ecc131a338d9c454e (patch) | |
| tree | 4e57720bbefe998dbafcce6a1fb015baa936a73e /drivers/mtd | |
| parent | c139b5ff0999ec3d44a02ebdb623a92e5782e53e (diff) | |
| parent | 4ea5243a3a2fbc59bbcdd401d75f1744bcd6280f (diff) | |
| download | u-boot-2431492aef1de33bd222c97ecc131a338d9c454e.tar.gz u-boot-2431492aef1de33bd222c97ecc131a338d9c454e.tar.xz u-boot-2431492aef1de33bd222c97ecc131a338d9c454e.zip | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/spi/sf_dataflash.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/spi/sf_probe.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/spi/sf_dataflash.c b/drivers/mtd/spi/sf_dataflash.c index 3111f4fd12..b2a56da7ca 100644 --- a/drivers/mtd/spi/sf_dataflash.c +++ b/drivers/mtd/spi/sf_dataflash.c @@ -577,7 +577,7 @@ static struct flash_info *jedec_probe(struct spi_slave *spi, u8 *id) */ static int spi_dataflash_probe(struct udevice *dev) { - struct spi_slave *spi = dev_get_parentdata(dev); + struct spi_slave *spi = dev_get_parent_priv(dev); struct spi_flash *spi_flash; struct flash_info *info; u8 idcode[5]; diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c index 954376de15..3bf03f7a0a 100644 --- a/drivers/mtd/spi/sf_probe.c +++ b/drivers/mtd/spi/sf_probe.c @@ -471,7 +471,7 @@ int spi_flash_std_erase(struct udevice *dev, u32 offset, size_t len) int spi_flash_std_probe(struct udevice *dev) { - struct spi_slave *slave = dev_get_parentdata(dev); + struct spi_slave *slave = dev_get_parent_priv(dev); struct dm_spi_slave_platdata *plat = dev_get_parent_platdata(dev); struct spi_flash *flash; |