spi: cadence_qspi: Add support for Versal NET platform

Trivial changes to support cadence ospi driver for Versal NET platform.
Also avoid ospi flash reset for now.

Signed-off-by: Michal Simek <michal.simek@amd.com>
Link: https://lore.kernel.org/r/0789141f432189aab69bc496fe33e0218d1d7510.1663589964.git.michal.simek@amd.com

diff --git a/arch/arm/mach-versal-net/include/mach/hardware.h b/arch/arm/mach-versal-net/include/mach/hardware.h
index 2eb5498498258d0a7a866353aed7b48c0f11f2f8..808ce48fd148d66ae928881694704bf59caf3af5 100644 (file)
--- a/arch/arm/mach-versal-net/include/mach/hardware.h
+++ b/arch/arm/mach-versal-net/include/mach/hardware.h
@@ -25,3 +25,7 @@ enum versal_net_platform {
        VERSAL_NET_EMU = 2,
        VERSAL_NET_QEMU = 3,
 };
+
+#define VERSAL_SLCR_BASEADDR   0xF1060000
+#define VERSAL_AXI_MUX_SEL     (VERSAL_SLCR_BASEADDR + 0x504)
+#define VERSAL_OSPI_LINEAR_MODE        BIT(1)

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index ac91d8225821216f92d130c4dbf42b1778a3c8da..240ff212a39f23fdd1aad1d05b68c2496278823f 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -148,7 +148,7 @@ config CQSPI_REF_CLK
 
 config CADENCE_OSPI_VERSAL
        bool "Configure Versal OSPI"
-       depends on ARCH_VERSAL && CADENCE_QSPI
+       depends on (ARCH_VERSAL || ARCH_VERSAL_NET) && CADENCE_QSPI
        imply DM_GPIO
        help
          This option is used to enable Versal OSPI DMA operations which

diff --git a/drivers/spi/cadence_ospi_versal.c b/drivers/spi/cadence_ospi_versal.c
index a25c50bc50817293dbfb9ab4e2b40e749f66f136..a9547a820031159cbf6192975dd2f990e12b7a53 100644 (file)
--- a/drivers/spi/cadence_ospi_versal.c
+++ b/drivers/spi/cadence_ospi_versal.c
@@ -130,6 +130,7 @@ 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;
@@ -165,7 +166,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