diff options
author | Tom Rini <trini@konsulko.com> | 2020-08-23 16:06:38 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-08-23 16:06:38 -0400 |
commit | d584648dad691caec3ecc7777dbfa3f1936878e5 (patch) | |
tree | ee787f8204c917526859da55840f6f159a00b8ba /drivers/reset | |
parent | c84341f5acd6140f361300f02b354a7238f95b72 (diff) | |
parent | a4020350289c520e896fd6180e510be557ed3bf9 (diff) | |
download | u-boot-d584648dad691caec3ecc7777dbfa3f1936878e5.tar.gz u-boot-d584648dad691caec3ecc7777dbfa3f1936878e5.tar.xz u-boot-d584648dad691caec3ecc7777dbfa3f1936878e5.zip |
Merge tag 'dm-pull-22aug20' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm
replace devfdt_get_addr_ptr() with dev_read_addr_ptr()
binman fixes for portage
various minor fixes
'bind' command improvements
Diffstat (limited to 'drivers/reset')
-rw-r--r-- | drivers/reset/reset-socfpga.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/reset/reset-socfpga.c b/drivers/reset/reset-socfpga.c index 830eda9430..1849db4da9 100644 --- a/drivers/reset/reset-socfpga.c +++ b/drivers/reset/reset-socfpga.c @@ -118,7 +118,7 @@ static int socfpga_reset_probe(struct udevice *dev) u32 modrst_offset; void __iomem *membase; - membase = devfdt_get_addr_ptr(dev); + membase = dev_read_addr_ptr(dev); modrst_offset = dev_read_u32_default(dev, "altr,modrst-offset", 0x10); data->modrst_base = membase + modrst_offset; |