diff options
author | Tom Rini <trini@konsulko.com> | 2023-11-07 10:36:23 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2023-11-07 10:36:23 -0500 |
commit | e17d174773e9ba9447596708e702b7382e47a6cf (patch) | |
tree | ef27022ead88cb3d66df0eeed8df06035d223b80 /drivers/firmware/firmware-zynqmp.c | |
parent | 37229edccca13ea47e44865aaafd17890f9148b2 (diff) | |
parent | 37f500d711ec1f6b25189c1f6022ffe5e70a38ab (diff) |
Merge tag 'xilinx-for-v2024.01-rc3' of https://source.denx.de/u-boot/custodians/u-boot-microblaze
Xilinx changes for v2024.01-rc3
xilinx:
- Disable lock in mini spi configurations
zynq:
- DTS syncups
- Kconfig updates
zynqmp:
- DTS syncups
- Kconfig fixups
versal:
- Make 30MHz as default freq for spi
versal net:
- Enable ADMA for mmc
serial:
- Read baudrate from DT
spi:
- Put spi lock under one Kconfig
- Support 64bit addresses in cadance_ospi
- zynqmp_gqspi - change logging support
firmware:
- Handle errors in zynqmp_pm_feature()
include:
- Sync vsc8531 dt binding with kernel
Diffstat (limited to 'drivers/firmware/firmware-zynqmp.c')
-rw-r--r-- | drivers/firmware/firmware-zynqmp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/firmware/firmware-zynqmp.c b/drivers/firmware/firmware-zynqmp.c index 43fb7fa778..8ea15c7ed3 100644 --- a/drivers/firmware/firmware-zynqmp.c +++ b/drivers/firmware/firmware-zynqmp.c @@ -203,6 +203,8 @@ int zynqmp_pm_feature(const u32 api_id) /* Check feature check API version */ ret = xilinx_pm_request(PM_FEATURE_CHECK, api_id, 0, 0, 0, ret_payload); + if (ret) + return ret; /* Return feature check version */ return ret_payload[1] & FIRMWARE_VERSION_MASK; |