diff options
author | Tom Rini <trini@konsulko.com> | 2021-11-16 09:51:04 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2021-11-16 09:51:04 -0500 |
commit | 2ffa0e87df3a7595f71d05782924ee83146d9fe7 (patch) | |
tree | 4c0b1046ff1ef79e658c77a6b9342d87d53beb61 /drivers/mmc | |
parent | 9272805139a104c83dff8230e03e9626dd9bc195 (diff) | |
parent | 11c0255cd8a7177e2b714040efcfd51844cb5d8e (diff) | |
download | u-boot-2ffa0e87df3a7595f71d05782924ee83146d9fe7.zip u-boot-2ffa0e87df3a7595f71d05782924ee83146d9fe7.tar.gz u-boot-2ffa0e87df3a7595f71d05782924ee83146d9fe7.tar.bz2 |
Merge tag 'xilinx-for-v2022.01-rc3' of https://source.denx.de/u-boot/custodians/u-boot-microblazeWIP/16Nov2021
Xilinx changes for v2022.01-rc3
sdhci:
- Fix emmc mini case with missing firmware interface
zynqmp:
- Restore JTAG interface if required
- Allow overriding board name
- Add support for DLC21
- Fix one fallthrought statement description
- Use config macro instead of name duplication
- Save multiboot to variable
firmware:
- Handle ipi_req errors better
- Use local buffer in case user doesn't need it instead of NULL/0 location
spi:
- gqsi: Fix write issue at low frequencies
net:
- gem: Disable broadcasts
Diffstat (limited to 'drivers/mmc')
-rw-r--r-- | drivers/mmc/zynq_sdhci.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/mmc/zynq_sdhci.c b/drivers/mmc/zynq_sdhci.c index c94825d..5cea4c6 100644 --- a/drivers/mmc/zynq_sdhci.c +++ b/drivers/mmc/zynq_sdhci.c @@ -69,6 +69,12 @@ __weak int zynqmp_mmio_write(const u32 address, const u32 mask, const u32 value) return 0; } +__weak int xilinx_pm_request(u32 api_id, u32 arg0, u32 arg1, u32 arg2, + u32 arg3, u32 *ret_payload) +{ + return 0; +} + #if defined(CONFIG_ARCH_ZYNQMP) || defined(CONFIG_ARCH_VERSAL) /* Default settings for ZynqMP Clock Phases */ static const u32 zynqmp_iclk_phases[] = {0, 63, 63, 0, 63, 0, |