diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2026-10-16 18:40:34 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2026-10-16 18:40:51 +0200 |
| commit | 4d1e50a7ef21cecd2c8b5cc81d2a59d401779fe2 (patch) | |
| tree | d576a98df2dc0df59e113d644634d2429c224dc9 /include/linux/firmware | |
| parent | 3e71e9806863409d26dc046a419ff320f7bbde63 (diff) | |
| parent | 118be086595e8f98b19e8fa8e24276466a8e9483 (diff) | |
Merge tag 'zynqmp-soc-for-7.4' of https://github.com/Xilinx/linux-xlnx into soc/drivers
arm64: Xilinx SOC changes for 7.4
firmware:
- Update UFS and remoteproc firmware interfaces
* tag 'zynqmp-soc-for-7.4' of https://github.com/Xilinx/linux-xlnx:
firmware: xilinx: support RPU boot from DDR
firmware: xilinx: ufs: move PHY/SRAM ready polling into the firmware backend
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/linux/firmware')
| -rw-r--r-- | include/linux/firmware/xlnx-zynqmp-ufs.h | 8 | ||||
| -rw-r--r-- | include/linux/firmware/xlnx-zynqmp.h | 5 |
2 files changed, 4 insertions, 9 deletions
diff --git a/include/linux/firmware/xlnx-zynqmp-ufs.h b/include/linux/firmware/xlnx-zynqmp-ufs.h index d3538dd5822a..00383dd835f2 100644 --- a/include/linux/firmware/xlnx-zynqmp-ufs.h +++ b/include/linux/firmware/xlnx-zynqmp-ufs.h @@ -9,17 +9,17 @@ #define __FIRMWARE_XLNX_ZYNQMP_UFS_H__ #if IS_REACHABLE(CONFIG_ZYNQMP_FIRMWARE) -int zynqmp_pm_is_mphy_tx_rx_config_ready(bool *is_ready); -int zynqmp_pm_is_sram_init_done(bool *is_done); +int zynqmp_pm_wait_mphy_tx_rx_config_ready(u32 timeout_us); +int zynqmp_pm_wait_sram_init_done(u32 timeout_us); int zynqmp_pm_set_sram_bypass(void); int zynqmp_pm_get_ufs_calibration_values(u32 *val); #else -static inline int zynqmp_pm_is_mphy_tx_rx_config_ready(bool *is_ready) +static inline int zynqmp_pm_wait_mphy_tx_rx_config_ready(u32 timeout_us) { return -ENODEV; } -static inline int zynqmp_pm_is_sram_init_done(bool *is_done) +static inline int zynqmp_pm_wait_sram_init_done(u32 timeout_us) { return -ENODEV; } diff --git a/include/linux/firmware/xlnx-zynqmp.h b/include/linux/firmware/xlnx-zynqmp.h index f4b3df614c77..41a1cd810bda 100644 --- a/include/linux/firmware/xlnx-zynqmp.h +++ b/include/linux/firmware/xlnx-zynqmp.h @@ -277,11 +277,6 @@ enum rpu_oper_mode { PM_RPU_MODE_SPLIT = 1, }; -enum rpu_boot_mem { - PM_RPU_BOOTMEM_LOVEC = 0, - PM_RPU_BOOTMEM_HIVEC = 1, -}; - enum rpu_tcm_comb { PM_RPU_TCM_SPLIT = 0, PM_RPU_TCM_COMB = 1, |