diff options
| author | Tom Rini <[email protected]> | 2023-05-16 11:16:42 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-05-16 11:16:42 -0400 |
| commit | 5645a50a8639a53856bcda60f5eb9e07a5bd31a9 (patch) | |
| tree | 30c9ab7fd5b86a4a74aa554720cdb3fcaa67c8a0 /drivers/core | |
| 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')
| -rw-r--r-- | drivers/core/fdtaddr.c | 5 | ||||
| -rw-r--r-- | drivers/core/ofnode.c | 2 |
2 files changed, 5 insertions, 2 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) diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c index f49ee493d3c..ec574c44607 100644 --- a/drivers/core/ofnode.c +++ b/drivers/core/ofnode.c @@ -998,7 +998,7 @@ int ofnode_decode_panel_timing(ofnode parent, u32 val = 0; int ret = 0; - timings = ofnode_find_subnode(parent, "panel-timings"); + timings = ofnode_find_subnode(parent, "panel-timing"); if (!ofnode_valid(timings)) return -EINVAL; memset(dt, 0, sizeof(*dt)); |