diff options
| author | Tom Rini <trini@konsulko.com> | 2021-05-12 10:07:21 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-05-12 10:07:21 -0400 |
| commit | ea184cbff99ea1d82dcf94c95afe054e95da5069 (patch) | |
| tree | 48553e6cf25f0b5f34483c3fddafdebbbc240b55 /drivers/core/ofnode.c | |
| parent | 59a2b9e605c5a5e2dff35506a13b51f33d3051b4 (diff) | |
| parent | bbc9da58b332bd44e51ac5579040ea984b2f963b (diff) | |
Merge tag 'ti-v2021.07-rc3' of https://source.denx.de/u-boot/custodians/u-boot-ti
- Initial support for AM64 EVM and SK
- K3 DDR driver unification for J7 and AM64 platforms.
- Minor fixes for TI clock driver
Diffstat (limited to 'drivers/core/ofnode.c')
| -rw-r--r-- | drivers/core/ofnode.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c index d50533338e7..6c771e364fb 100644 --- a/drivers/core/ofnode.c +++ b/drivers/core/ofnode.c @@ -319,8 +319,7 @@ fdt_addr_t ofnode_get_addr_size_index(ofnode node, int index, fdt_size_t *size) ns = of_n_size_cells(ofnode_to_np(node)); - if (IS_ENABLED(CONFIG_OF_TRANSLATE) && - (ns > 0 || gd_size_cells_0())) { + if (IS_ENABLED(CONFIG_OF_TRANSLATE) && ns > 0) { return of_translate_address(ofnode_to_np(node), prop_val); } else { na = of_n_addr_cells(ofnode_to_np(node)); @@ -703,10 +702,8 @@ fdt_addr_t ofnode_get_addr_size(ofnode node, const char *property, ns = of_n_size_cells(np); *sizep = of_read_number(prop + na, ns); - if (CONFIG_IS_ENABLED(OF_TRANSLATE) && - (ns > 0 || gd_size_cells_0())) { + if (CONFIG_IS_ENABLED(OF_TRANSLATE) && ns > 0) return of_translate_address(np, prop); - } else return of_read_number(prop, na); } else { |