diff options
| author | Tom Rini <trini@konsulko.com> | 2023-05-16 11:16:42 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-05-16 11:16:42 -0400 |
| commit | 5645a50a8639a53856bcda60f5eb9e07a5bd31a9 (patch) | |
| tree | 30c9ab7fd5b86a4a74aa554720cdb3fcaa67c8a0 /drivers/core/fdtaddr.c | |
| parent | c21fc9e1529e22c7acffe9bec7c0500ea15559dc (diff) | |
| parent | 6d677ea8ecd11c26e45dae1ed855ec275177b149 (diff) | |
Merge branch '2023-05-15-assorted-bugfixes'
- Merge in a long-standing fix for some exynos platforms, correct a
Kconfig description, fix some env issues, fix an issue in
devfdt_get_addr_size_index_ptr and look for "panel-timings" not
"panel-timing" per upstream binding.
Diffstat (limited to 'drivers/core/fdtaddr.c')
| -rw-r--r-- | drivers/core/fdtaddr.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/core/fdtaddr.c b/drivers/core/fdtaddr.c index 3b59b70c24a..546db675aaf 100644 --- a/drivers/core/fdtaddr.c +++ b/drivers/core/fdtaddr.c @@ -131,7 +131,10 @@ void *devfdt_get_addr_size_index_ptr(const struct udevice *dev, int index, { fdt_addr_t addr = devfdt_get_addr_size_index(dev, index, size); - return (addr == FDT_ADDR_T_NONE) ? NULL : (void *)(uintptr_t)addr; + if (addr == FDT_ADDR_T_NONE) + return NULL; + + return map_sysmem(addr, 0); } fdt_addr_t devfdt_get_addr_name(const struct udevice *dev, const char *name) |