diff options
| author | Tom Rini <trini@konsulko.com> | 2023-05-09 12:45:49 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-05-09 12:45:49 -0400 |
| commit | 0a9a4384c1483a88776bca38e28f09be51161034 (patch) | |
| tree | c39e9bac9413c5c90f8da424865d67a7efdca315 /arch/arm/mach-mvebu/system-controller.c | |
| parent | f1d33a44ca04fdca241c1d89fd79e2e56c930c7e (diff) | |
| parent | 716ed2a8c0bba085372df0eb7edb580b11e8d94c (diff) | |
Merge tag 'u-boot-rockchip-20230509' of https://source.denx.de/u-boot/custodians/u-boot-rockchip
- Rockchip NFC driver update and dev addr pointer api update;
- use standard dr_mode for usb driver;
- rock pi boards dts update;
- Add rk3566 Anbernic boards;
- Misc fixes for drivers;
Diffstat (limited to 'arch/arm/mach-mvebu/system-controller.c')
| -rw-r--r-- | arch/arm/mach-mvebu/system-controller.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mvebu/system-controller.c b/arch/arm/mach-mvebu/system-controller.c index e90aff0c337..7cdde11cbd2 100644 --- a/arch/arm/mach-mvebu/system-controller.c +++ b/arch/arm/mach-mvebu/system-controller.c @@ -71,8 +71,8 @@ static int mvebu_reset_of_to_plat(struct udevice *dev) { struct mvebu_reset_data *data = dev_get_priv(dev); - data->base = (void *)dev_read_addr(dev); - if ((fdt_addr_t)data->base == FDT_ADDR_T_NONE) + data->base = dev_read_addr_ptr(dev); + if (!data->base) return -EINVAL; return 0; |