diff options
| author | Tom Rini <[email protected]> | 2024-12-25 22:31:04 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-12-25 22:31:04 -0600 |
| commit | 5cfbf8c3644cc95c3c8b5d2541ed7f32136c0da1 (patch) | |
| tree | 3acd513189d5a8ba449a6e213a57c53f3fb2cdfb /common | |
| parent | 2c366eb1cd7ecad7b1d955b54219ba1447e2a47d (diff) | |
| parent | 3391587e3fe22db6c71882f652e13543a4501694 (diff) | |
Merge tag 'v2025.01-rc5' into next
Prepare v2025.01-rc5
Diffstat (limited to 'common')
| -rw-r--r-- | common/memtop.c | 4 | ||||
| -rw-r--r-- | common/usb_onboard_hub.c | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/common/memtop.c b/common/memtop.c index 841d89e0799..bff27d8211e 100644 --- a/common/memtop.c +++ b/common/memtop.c @@ -121,8 +121,8 @@ static long region_overlap_check(struct mem_region *mem_rgn, phys_addr_t base, return (i < mem_rgn->count) ? i : -1; } -static int find_ram_top(struct mem_region *free_mem, - struct mem_region *reserved_mem, phys_size_t size) +static phys_addr_t find_ram_top(struct mem_region *free_mem, + struct mem_region *reserved_mem, phys_size_t size) { long i, rgn; phys_addr_t base = 0; diff --git a/common/usb_onboard_hub.c b/common/usb_onboard_hub.c index 6f28036e095..7fe62b043e6 100644 --- a/common/usb_onboard_hub.c +++ b/common/usb_onboard_hub.c @@ -183,7 +183,12 @@ static int usb_onboard_hub_bind(struct udevice *dev) int ret, off; ret = dev_read_phandle_with_args(dev, "peer-hub", NULL, 0, 0, &phandle); - if (ret) { + if (ret == -ENOENT) { + dev_dbg(dev, "peer-hub property not present\n"); + return 0; + } + + if (ret) { dev_err(dev, "peer-hub not specified\n"); return ret; } |