diff options
| author | Tom Rini <trini@konsulko.com> | 2015-09-16 09:53:37 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-09-16 09:53:37 -0400 |
| commit | fa43ce842c3026c2abf19d4234d02cd4c62eeec0 (patch) | |
| tree | 39ec6c77155553eb1865ac67504dd8502cebaff8 /drivers | |
| parent | 2fc1c80edefddd72b91be5fcfae0a6cb8e3f597c (diff) | |
| parent | 02464e386bb5f0a022c121f95ae75cf583759d95 (diff) | |
| download | u-boot-imx-fa43ce842c3026c2abf19d4234d02cd4c62eeec0.zip u-boot-imx-fa43ce842c3026c2abf19d4234d02cd4c62eeec0.tar.gz u-boot-imx-fa43ce842c3026c2abf19d4234d02cd4c62eeec0.tar.bz2 | |
Merge git://git.denx.de/u-boot-fdt
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/core/device.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/core/device.c b/drivers/core/device.c index 0ccd443..0bc04d4 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -581,7 +581,10 @@ fdt_addr_t dev_get_addr(struct udevice *dev) #if CONFIG_IS_ENABLED(OF_CONTROL) fdt_addr_t addr; - addr = fdtdec_get_addr(gd->fdt_blob, dev->of_offset, "reg"); + addr = fdtdec_get_addr_size_auto_parent(gd->fdt_blob, + dev->parent->of_offset, + dev->of_offset, "reg", + 0, NULL); if (CONFIG_IS_ENABLED(SIMPLE_BUS) && addr != FDT_ADDR_T_NONE) { if (device_get_uclass_id(dev->parent) == UCLASS_SIMPLE_BUS) addr = simple_bus_translate(dev->parent, addr); |