diff options
| author | Tom Rini <trini@konsulko.com> | 2021-01-12 09:32:48 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-01-12 09:32:48 -0500 |
| commit | ee6726be4f0dccb612f0193c62ca149164c8a5af (patch) | |
| tree | c58716b51bec487da0c5ac8929bc072549c90b07 /drivers/core/of_addr.c | |
| parent | 996f217ea368ecaef84863bb29699c0e185b9be7 (diff) | |
| parent | ea3f5348063ebe4f41be7d1ba3ef0afe56a04a40 (diff) | |
Merge tag 'ti-v2021.04-rc1' of https://gitlab.denx.de/u-boot/custodians/u-boot-ti
- DM support for OMAP PWM backlight
- USB host mode support for AM654
- Minor SPI fixes
- Add support k2g ice board with 1GHz silicon
- Fix GTC programming for K3 devices
Diffstat (limited to 'drivers/core/of_addr.c')
| -rw-r--r-- | drivers/core/of_addr.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/core/of_addr.c b/drivers/core/of_addr.c index ca34d84922b..bbe80136ba8 100644 --- a/drivers/core/of_addr.c +++ b/drivers/core/of_addr.c @@ -18,7 +18,8 @@ /* Max address size we deal with */ #define OF_MAX_ADDR_CELLS 4 #define OF_CHECK_ADDR_COUNT(na) ((na) > 0 && (na) <= OF_MAX_ADDR_CELLS) -#define OF_CHECK_COUNTS(na, ns) (OF_CHECK_ADDR_COUNT(na) && (ns) > 0) +#define OF_CHECK_COUNTS(na, ns) (OF_CHECK_ADDR_COUNT(na) && \ + ((ns) > 0 || gd_size_cells_0())) static struct of_bus *of_match_bus(struct device_node *np); @@ -162,11 +163,6 @@ const __be32 *of_get_address(const struct device_node *dev, int index, } EXPORT_SYMBOL(of_get_address); -static int of_empty_ranges_quirk(const struct device_node *np) -{ - return false; -} - static int of_translate_one(const struct device_node *parent, struct of_bus *bus, struct of_bus *pbus, __be32 *addr, int na, int ns, int pna, @@ -193,11 +189,8 @@ static int of_translate_one(const struct device_node *parent, * As far as we know, this damage only exists on Apple machines, so * This code is only enabled on powerpc. --gcl */ + ranges = of_get_property(parent, rprop, &rlen); - if (ranges == NULL && !of_empty_ranges_quirk(parent)) { - debug("no ranges; cannot translate\n"); - return 1; - } if (ranges == NULL || rlen == 0) { offset = of_read_number(addr, na); memset(addr, 0, pna * 4); |