diff options
| author | Tom Rini <trini@konsulko.com> | 2023-07-21 09:57:59 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-07-21 09:57:59 -0400 |
| commit | e7f7e2e1e22fd719a8810ba488a9451635b13d1b (patch) | |
| tree | 0dda2ed98b772b44ae61b041d402f9618cd18670 /drivers/spi/cadence_ospi_versal.c | |
| parent | e896279ac39ebb97f23e6132bf7668a61e1cd86b (diff) | |
| parent | a1190b4d6a9bf3a45038e3eba4a11de4be2b1cca (diff) | |
Merge tag 'xilinx-for-v2023.10-rc1-v2' of https://source.denx.de/u-boot/custodians/u-boot-microblaze
Xilinx changes for v2023.10-rc1 v2
axi_emac:
- Change return value if RX packet is not ready
cadence_qspi:
- Enable flash reset for Versal NET
dt:
- Various DT syncups with Linux kernel
- SOM - reserved pmufw memory location
fpga:
- Add load event
mtd:
- Add missing dependency for FLASH_CFI_MTD
spi/nand:
- Minor cleanup in Xilinx drivers
versal-net:
- Prioritize boot device in boot_targets
- Wire mini ospi/qspi/emmc configurations
watchdog:
- Use new versal-wwdt property
xilinx:
- fix sparse warnings in various places ps7_init*
- add missing headers
- consolidate code around zynqmp_mmio_read/write
- switch to amd.com email
zynqmp_clk:
- Add handling for gem rx/tsu clocks
zynq_gem:
- Configure mdio clock at run time
zynq:
- Enable fdt overlay support
zynq_sdhci:
- Call dll reset only for ZynqMP SOCs
Diffstat (limited to 'drivers/spi/cadence_ospi_versal.c')
| -rw-r--r-- | drivers/spi/cadence_ospi_versal.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/spi/cadence_ospi_versal.c b/drivers/spi/cadence_ospi_versal.c index 434c6038f3..a7685a2f51 100644 --- a/drivers/spi/cadence_ospi_versal.c +++ b/drivers/spi/cadence_ospi_versal.c @@ -130,7 +130,6 @@ int cadence_qspi_apb_wait_for_dma_cmplt(struct cadence_spi_priv *priv) #if defined(CONFIG_DM_GPIO) int cadence_qspi_versal_flash_reset(struct udevice *dev) { -#ifndef CONFIG_ARCH_VERSAL_NET struct gpio_desc gpio; u32 reset_gpio; int ret; @@ -166,7 +165,7 @@ int cadence_qspi_versal_flash_reset(struct udevice *dev) /* Set value 1 to pin */ dm_gpio_set_value(&gpio, 1); udelay(1); -#endif + return 0; } #else |