diff options
| author | Tom Rini <trini@konsulko.com> | 2023-07-20 21:31:31 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-07-20 21:31:31 -0400 |
| commit | e896279ac39ebb97f23e6132bf7668a61e1cd86b (patch) | |
| tree | 24e035ebd13dbd272da4b3845a1dfcac66e4a86f /drivers | |
| parent | 7fe5accb4516144b7abb8f183640cdf50423121e (diff) | |
| parent | 24142ead21ed5e4d2d6f39dd410d91d815ea1ae2 (diff) | |
Merge tag 'dm-pull-20jul23' of https://source.denx.de/u-boot/custodians/u-boot-dm
binman mkimage and template enhancements
misc fixes
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/core/of_access.c | 5 | ||||
| -rw-r--r-- | drivers/core/read.c | 5 | ||||
| -rw-r--r-- | drivers/reset/reset-rockchip.c | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/drivers/core/of_access.c b/drivers/core/of_access.c index 81a307992c0..57f10445b12 100644 --- a/drivers/core/of_access.c +++ b/drivers/core/of_access.c @@ -593,11 +593,14 @@ int of_read_u64(const struct device_node *np, const char *propname, u64 *outp) int of_property_match_string(const struct device_node *np, const char *propname, const char *string) { - const struct property *prop = of_find_property(np, propname, NULL); + int len = 0; + const struct property *prop = of_find_property(np, propname, &len); size_t l; int i; const char *p, *end; + if (!prop && len == -FDT_ERR_NOTFOUND) + return -ENOENT; if (!prop) return -EINVAL; if (!prop->value) diff --git a/drivers/core/read.c b/drivers/core/read.c index 0289a2edb6a..5749473a6ca 100644 --- a/drivers/core/read.c +++ b/drivers/core/read.c @@ -211,10 +211,9 @@ void *dev_remap_addr(const struct udevice *dev) return dev_remap_addr_index(dev, 0); } -fdt_addr_t dev_read_addr_size(const struct udevice *dev, const char *property, - fdt_size_t *sizep) +fdt_addr_t dev_read_addr_size(const struct udevice *dev, fdt_size_t *sizep) { - return ofnode_get_addr_size(dev_ofnode(dev), property, sizep); + return dev_read_addr_size_index(dev, 0, sizep); } const char *dev_read_name(const struct udevice *dev) diff --git a/drivers/reset/reset-rockchip.c b/drivers/reset/reset-rockchip.c index 2ebe3382f70..6cabaa10a35 100644 --- a/drivers/reset/reset-rockchip.c +++ b/drivers/reset/reset-rockchip.c @@ -97,7 +97,7 @@ static int rockchip_reset_probe(struct udevice *dev) fdt_addr_t addr; fdt_size_t size; - addr = dev_read_addr_size(dev, "reg", &size); + addr = dev_read_addr_size(dev, &size); if (addr == FDT_ADDR_T_NONE) return -EINVAL; |