]> git.sur5r.net Git - u-boot/commitdiff
Merge branch 'master' of git://git.denx.de/u-boot-sunxi master
authorTom Rini <trini@konsulko.com>
Tue, 17 Jul 2018 18:28:47 +0000 (14:28 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 17 Jul 2018 18:28:47 +0000 (14:28 -0400)
arch/arm/dts/zynqmp-zcu102-revA.dts
configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
configs/xilinx_zynqmp_zcu102_revA_defconfig
configs/xilinx_zynqmp_zcu102_revB_defconfig
drivers/mtd/spi/spi_flash_ids.c
drivers/spi/Kconfig
drivers/spi/Makefile
drivers/spi/xilinx_spi.c
drivers/spi/zynqmp_gqspi.c [new file with mode: 0644]

index ddc3fbae1f6d893f2f20801fb80425d2612ed858..ac7035fde760c6d0e9a4040a3527bc78cf122479 100644 (file)
        status = "okay";
        is-dual = <1>;
        flash@0 {
-               compatible = "m25p80"; /* 32MB */
+               compatible = "m25p80", "spi-flash"; /* 32MB */
                #address-cells = <1>;
                #size-cells = <1>;
                reg = <0x0>;
index b89b87dd6678f8e01356b2ebef01f113a1e20d47..5a7d91d7660337668b2f328441e875965ea10a27 100644 (file)
@@ -37,6 +37,7 @@ CONFIG_CMD_GPT=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SDRAM=y
+CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_TFTPPUT=y
 CONFIG_CMD_TIME=y
@@ -71,6 +72,7 @@ CONFIG_MMC_IO_VOLTAGE=y
 CONFIG_MMC_UHS_SUPPORT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
+CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_MACRONIX=y
@@ -92,6 +94,9 @@ CONFIG_DM_SCSI=y
 CONFIG_DEBUG_UART_ZYNQ=y
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_ZYNQ_SERIAL=y
+CONFIG_SPI=y
+CONFIG_DM_SPI=y
+CONFIG_ZYNQMP_GQSPI=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
index e36b4a7f409940cf92f9c192c5fba7d5e7434638..5b67ff9ea35a2c6a5eeb13e32991769688d30c3e 100644 (file)
@@ -36,6 +36,7 @@ CONFIG_CMD_GPT=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SDRAM=y
+CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_TFTPPUT=y
 CONFIG_CMD_TIME=y
@@ -68,6 +69,7 @@ CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
 CONFIG_DM_MMC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
+CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_MACRONIX=y
@@ -89,6 +91,9 @@ CONFIG_DM_SCSI=y
 CONFIG_DEBUG_UART_ZYNQ=y
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_ZYNQ_SERIAL=y
+CONFIG_SPI=y
+CONFIG_DM_SPI=y
+CONFIG_ZYNQMP_GQSPI=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
index c941cb2edb95d21a8d0128739c3289779a677a22..deaae6cc2d38e348f95dc197f5577829926524b8 100644 (file)
@@ -36,6 +36,7 @@ CONFIG_CMD_GPT=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SDRAM=y
+CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_TFTPPUT=y
 CONFIG_CMD_TIME=y
@@ -68,6 +69,7 @@ CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
 CONFIG_DM_MMC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
+CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_MACRONIX=y
@@ -89,6 +91,9 @@ CONFIG_DM_SCSI=y
 CONFIG_DEBUG_UART_ZYNQ=y
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_ZYNQ_SERIAL=y
+CONFIG_SPI=y
+CONFIG_DM_SPI=y
+CONFIG_ZYNQMP_GQSPI=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
index 9212373daec47d47c14a44891c8e2f0a3e165c1d..3cdee508c813c62968f22ec8a00242c7497032c7 100644 (file)
@@ -62,6 +62,7 @@ const struct spi_flash_info spi_flash_ids[] = {
        {"en25s64",        INFO(0x1c3817, 0x0, 64 * 1024,   128, 0) },
 #endif
 #ifdef CONFIG_SPI_FLASH_GIGADEVICE     /* GIGADEVICE */
+       {"gd25q16c",       INFO(0xc84015, 0x0, 64 * 1024,    32, RD_FULL | WR_QPP | SECT_4K) },
        {"gd25q64b",       INFO(0xc84017, 0x0, 64 * 1024,   128, SECT_4K) },
        {"gd25q32b",       INFO(0xc84016, 0x0, 64 * 1024,    64, SECT_4K) },
        {"gd25lq32",       INFO(0xc86016, 0x0, 64 * 1024,    64, SECT_4K) },
@@ -86,6 +87,7 @@ const struct spi_flash_info spi_flash_ids[] = {
        {"mx25l12805",     INFO(0xc22018, 0x0, 64 * 1024,   256, RD_FULL | WR_QPP) },
        {"mx25l25635f",    INFO(0xc22019, 0x0, 64 * 1024,   512, RD_FULL | WR_QPP) },
        {"mx25l51235f",    INFO(0xc2201a, 0x0, 64 * 1024,  1024, RD_FULL | WR_QPP) },
+       {"mx25l1633e",     INFO(0xc22415, 0x0, 64 * 1024,    32, RD_FULL | WR_QPP | SECT_4K) },
        {"mx25u6435f",     INFO(0xc22537, 0x0, 64 * 1024,   128, RD_FULL | WR_QPP) },
        {"mx25l12855e",    INFO(0xc22618, 0x0, 64 * 1024,   256, RD_FULL | WR_QPP) },
        {"mx25u1635e",     INFO(0xc22535, 0x0, 64 * 1024,  32, SECT_4K) },
@@ -176,10 +178,15 @@ const struct spi_flash_info spi_flash_ids[] = {
        {"w25q256",        INFO(0xef4019, 0x0,  64 * 1024,   512, RD_FULL | WR_QPP | SECT_4K) },
        {"w25q80bw",       INFO(0xef5014, 0x0,  64 * 1024,    16, RD_FULL | WR_QPP | SECT_4K) },
        {"w25q16dw",       INFO(0xef6015, 0x0,  64 * 1024,    32, RD_FULL | WR_QPP | SECT_4K) },
+       {"w25q16jv",       INFO(0xef7015, 0x0,  64 * 1024,    32, RD_FULL | WR_QPP | SECT_4K) },
        {"w25q32dw",       INFO(0xef6016, 0x0,  64 * 1024,    64, RD_FULL | WR_QPP | SECT_4K) },
+       {"w25q32jv",       INFO(0xef7016, 0x0,  64 * 1024,    64, RD_FULL | WR_QPP | SECT_4K) },
        {"w25q64dw",       INFO(0xef6017, 0x0,  64 * 1024,   128, RD_FULL | WR_QPP | SECT_4K) },
+       {"w25q64jv",       INFO(0xef7017, 0x0,  64 * 1024,   128, RD_FULL | WR_QPP | SECT_4K) },
        {"w25q128fw",      INFO(0xef6018, 0x0,  64 * 1024,   256, RD_FULL | WR_QPP | SECT_4K) },
+       {"w25q128jv",      INFO(0xef7018, 0x0,  64 * 1024,   256, RD_FULL | WR_QPP | SECT_4K) },
        {"w25q256fw",      INFO(0xef6019, 0x0,  64 * 1024,   512, RD_FULL | WR_QPP | SECT_4K) },
+       {"w25q256jw",      INFO(0xef7019, 0x0,  64 * 1024,   512, RD_FULL | WR_QPP | SECT_4K) },
 #endif
        {},     /* Empty entry to terminate the list */
        /*
@@ -187,7 +194,7 @@ const struct spi_flash_info spi_flash_ids[] = {
         * Below paired flash devices has similar spi_flash params.
         * (s25fl129p_64k, s25fl128s_64k)
         * (w25q80bl, w25q80bv)
-        * (w25q16cl, w25q16dv)
+        * (w25q16cl, w25q16dv, w25q16jv)
         * (w25q32bv, w25q32fv_spi)
         * (w25q64cv, w25q64fv_spi)
         * (w25q128bv, w25q128fv_spi)
index f5960a7c955b750e83039539f095dc4cfa1107a2..b85fca562899eecc78f853f22ee7579d66cfc068 100644 (file)
@@ -230,6 +230,13 @@ config ZYNQ_QSPI
          Zynq QSPI IP core. This IP is used to connect the flash in
          4-bit qspi, 8-bit dual stacked and shared 4-bit dual parallel.
 
+config ZYNQMP_GQSPI
+       bool "Configure ZynqMP Generic QSPI"
+       depends on ARCH_ZYNQMP
+       help
+         This option is used to enable ZynqMP QSPI controller driver which
+         is used to communicate with qspi flash devices.
+
 endif # if DM_SPI
 
 config SOFT_SPI
index e73b0cd7d5fd711e71aa805cf4ee8210493c80bb..95b03a29dc05e90445434416847ddb47c3a2276e 100644 (file)
@@ -52,3 +52,4 @@ obj-$(CONFIG_TI_QSPI) += ti_qspi.o
 obj-$(CONFIG_XILINX_SPI) += xilinx_spi.o
 obj-$(CONFIG_ZYNQ_SPI) += zynq_spi.o
 obj-$(CONFIG_ZYNQ_QSPI) += zynq_qspi.o
+obj-$(CONFIG_ZYNQMP_GQSPI) += zynqmp_gqspi.o
index 8f0f32f68f6bcb4fe15cb3c2ed5c050b2ba6b95d..2b5f2cf54838251c7e4a277629e4d4c371b60596 100644 (file)
@@ -19,6 +19,7 @@
 #include <malloc.h>
 #include <spi.h>
 #include <asm/io.h>
+#include <wait_bit.h>
 
 /*
  * [0]: http://www.xilinx.com/support/documentation
@@ -77,9 +78,7 @@
 #define CONFIG_XILINX_SPI_IDLE_VAL     GENMASK(7, 0)
 #endif
 
-#ifndef CONFIG_SYS_XILINX_SPI_LIST
-#define CONFIG_SYS_XILINX_SPI_LIST     { CONFIG_SYS_SPI_BASE }
-#endif
+#define XILINX_SPISR_TIMEOUT   10000 /* in milliseconds */
 
 /* xilinx spi register set */
 struct xilinx_spi_regs {
@@ -105,15 +104,18 @@ struct xilinx_spi_priv {
        struct xilinx_spi_regs *regs;
        unsigned int freq;
        unsigned int mode;
+       unsigned int fifo_depth;
+       u8 startup;
 };
 
-static unsigned long xilinx_spi_base_list[] = CONFIG_SYS_XILINX_SPI_LIST;
 static int xilinx_spi_probe(struct udevice *bus)
 {
        struct xilinx_spi_priv *priv = dev_get_priv(bus);
        struct xilinx_spi_regs *regs = priv->regs;
 
-       priv->regs = (struct xilinx_spi_regs *)xilinx_spi_base_list[bus->seq];
+       priv->regs = (struct xilinx_spi_regs *)dev_read_addr(bus);
+
+       priv->fifo_depth = dev_read_u32_default(bus, "fifo-size", 0);
 
        writel(SPISSR_RESET_VALUE, &regs->srr);
 
@@ -162,6 +164,80 @@ static int xilinx_spi_release_bus(struct udevice *dev)
        return 0;
 }
 
+static u32 xilinx_spi_fill_txfifo(struct udevice *bus, const u8 *txp,
+                                 u32 txbytes)
+{
+       struct xilinx_spi_priv *priv = dev_get_priv(bus);
+       struct xilinx_spi_regs *regs = priv->regs;
+       unsigned char d;
+       u32 i = 0;
+
+       while (txbytes && !(readl(&regs->spisr) & SPISR_TX_FULL) &&
+              i < priv->fifo_depth) {
+               d = txp ? *txp++ : CONFIG_XILINX_SPI_IDLE_VAL;
+               debug("spi_xfer: tx:%x ", d);
+               /* write out and wait for processing (receive data) */
+               writel(d & SPIDTR_8BIT_MASK, &regs->spidtr);
+               txbytes--;
+               i++;
+       }
+
+       return i;
+}
+
+static u32 xilinx_spi_read_rxfifo(struct udevice *bus, u8 *rxp, u32 rxbytes)
+{
+       struct xilinx_spi_priv *priv = dev_get_priv(bus);
+       struct xilinx_spi_regs *regs = priv->regs;
+       unsigned char d;
+       unsigned int i = 0;
+
+       while (rxbytes && !(readl(&regs->spisr) & SPISR_RX_EMPTY)) {
+               d = readl(&regs->spidrr) & SPIDRR_8BIT_MASK;
+               if (rxp)
+                       *rxp++ = d;
+               debug("spi_xfer: rx:%x\n", d);
+               rxbytes--;
+               i++;
+       }
+       debug("Rx_done\n");
+
+       return i;
+}
+
+static void xilinx_spi_startup_block(struct udevice *dev, unsigned int bytes,
+                                    const void *dout, void *din)
+{
+       struct udevice *bus = dev_get_parent(dev);
+       struct xilinx_spi_priv *priv = dev_get_priv(bus);
+       struct xilinx_spi_regs *regs = priv->regs;
+       struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev);
+       const unsigned char *txp = dout;
+       unsigned char *rxp = din;
+       u32 reg, count;
+       u32 txbytes = bytes;
+       u32 rxbytes = bytes;
+
+       /*
+        * This loop runs two times. First time to send the command.
+        * Second time to transfer data. After transferring data,
+        * it sets txp to the initial value for the normal operation.
+        */
+       for ( ; priv->startup < 2; priv->startup++) {
+               count = xilinx_spi_fill_txfifo(bus, txp, txbytes);
+               reg = readl(&regs->spicr) & ~SPICR_MASTER_INHIBIT;
+               writel(reg, &regs->spicr);
+               count = xilinx_spi_read_rxfifo(bus, rxp, rxbytes);
+               txp = din;
+
+               if (priv->startup) {
+                       spi_cs_deactivate(dev);
+                       spi_cs_activate(dev, slave_plat->cs);
+                       txp = dout;
+               }
+       }
+}
+
 static int xilinx_spi_xfer(struct udevice *dev, unsigned int bitlen,
                            const void *dout, void *din, unsigned long flags)
 {
@@ -173,8 +249,10 @@ static int xilinx_spi_xfer(struct udevice *dev, unsigned int bitlen,
        unsigned int bytes = bitlen / XILSPI_MAX_XFER_BITS;
        const unsigned char *txp = dout;
        unsigned char *rxp = din;
-       unsigned rxecount = 17; /* max. 16 elements in FIFO, leftover 1 */
-       unsigned global_timeout;
+       u32 txbytes = bytes;
+       u32 rxbytes = bytes;
+       u32 reg, count, timeout;
+       int ret;
 
        debug("spi_xfer: bus:%i cs:%i bitlen:%i bytes:%i flags:%lx\n",
              bus->seq, slave_plat->cs, bitlen, bytes, flags);
@@ -189,48 +267,38 @@ static int xilinx_spi_xfer(struct udevice *dev, unsigned int bitlen,
                goto done;
        }
 
-       /* empty read buffer */
-       while (rxecount && !(readl(&regs->spisr) & SPISR_RX_EMPTY)) {
-               readl(&regs->spidrr);
-               rxecount--;
-       }
-
-       if (!rxecount) {
-               printf("XILSPI error: Rx buffer not empty\n");
-               return -1;
-       }
-
        if (flags & SPI_XFER_BEGIN)
                spi_cs_activate(dev, slave_plat->cs);
 
-       /* at least 1usec or greater, leftover 1 */
-       global_timeout = priv->freq > XILSPI_MAX_XFER_BITS * 1000000 ? 2 :
-                       (XILSPI_MAX_XFER_BITS * 1000000 / priv->freq) + 1;
-
-       while (bytes--) {
-               unsigned timeout = global_timeout;
-               /* get Tx element from data out buffer and count up */
-               unsigned char d = txp ? *txp++ : CONFIG_XILINX_SPI_IDLE_VAL;
-               debug("spi_xfer: tx:%x ", d);
-
-               /* write out and wait for processing (receive data) */
-               writel(d & SPIDTR_8BIT_MASK, &regs->spidtr);
-               while (timeout && readl(&regs->spisr)
-                                               & SPISR_RX_EMPTY) {
-                       timeout--;
-                       udelay(1);
-               }
-
-               if (!timeout) {
+       /*
+        * This is the work around for the startup block issue in
+        * the spi controller. SPI clock is passing through STARTUP
+        * block to FLASH. STARTUP block don't provide clock as soon
+        * as QSPI provides command. So first command fails.
+        */
+       xilinx_spi_startup_block(dev, bytes, dout, din);
+
+       while (txbytes && rxbytes) {
+               count = xilinx_spi_fill_txfifo(bus, txp, txbytes);
+               reg = readl(&regs->spicr) & ~SPICR_MASTER_INHIBIT;
+               writel(reg, &regs->spicr);
+               txbytes -= count;
+               if (txp)
+                       txp += count;
+
+               ret = wait_for_bit_le32(&regs->spisr, SPISR_TX_EMPTY, true,
+                                       XILINX_SPISR_TIMEOUT, false);
+               if (ret < 0) {
                        printf("XILSPI error: Xfer timeout\n");
-                       return -1;
+                       return ret;
                }
 
-               /* read Rx element and push into data in buffer */
-               d = readl(&regs->spidrr) & SPIDRR_8BIT_MASK;
+               debug("txbytes:0x%x,txp:0x%p\n", txbytes, txp);
+               count = xilinx_spi_read_rxfifo(bus, rxp, rxbytes);
+               rxbytes -= count;
                if (rxp)
-                       *rxp++ = d;
-               debug("spi_xfer: rx:%x\n", d);
+                       rxp += count;
+               debug("rxbytes:0x%x rxp:0x%p\n", rxbytes, rxp);
        }
 
  done:
diff --git a/drivers/spi/zynqmp_gqspi.c b/drivers/spi/zynqmp_gqspi.c
new file mode 100644 (file)
index 0000000..75459d1
--- /dev/null
@@ -0,0 +1,729 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * (C) Copyright 2018 Xilinx
+ *
+ * Xilinx ZynqMP Generic Quad-SPI(QSPI) controller driver(master mode only)
+ */
+
+#include <common.h>
+#include <asm/arch/clk.h>
+#include <asm/arch/hardware.h>
+#include <asm/arch/sys_proto.h>
+#include <asm/io.h>
+#include <clk.h>
+#include <dm.h>
+#include <malloc.h>
+#include <memalign.h>
+#include <spi.h>
+#include <ubi_uboot.h>
+#include <wait_bit.h>
+
+#define GQSPI_GFIFO_STRT_MODE_MASK     BIT(29)
+#define GQSPI_CONFIG_MODE_EN_MASK      (3 << 30)
+#define GQSPI_CONFIG_DMA_MODE          (2 << 30)
+#define GQSPI_CONFIG_CPHA_MASK         BIT(2)
+#define GQSPI_CONFIG_CPOL_MASK         BIT(1)
+
+/*
+ * QSPI Interrupt Registers bit Masks
+ *
+ * All the four interrupt registers (Status/Mask/Enable/Disable) have the same
+ * bit definitions.
+ */
+#define GQSPI_IXR_TXNFULL_MASK         0x00000004 /* QSPI TX FIFO Overflow */
+#define GQSPI_IXR_TXFULL_MASK          0x00000008 /* QSPI TX FIFO is full */
+#define GQSPI_IXR_RXNEMTY_MASK         0x00000010 /* QSPI RX FIFO Not Empty */
+#define GQSPI_IXR_GFEMTY_MASK          0x00000080 /* QSPI Generic FIFO Empty */
+#define GQSPI_IXR_ALL_MASK             (GQSPI_IXR_TXNFULL_MASK | \
+                                        GQSPI_IXR_RXNEMTY_MASK)
+
+/*
+ * QSPI Enable Register bit Masks
+ *
+ * This register is used to enable or disable the QSPI controller
+ */
+#define GQSPI_ENABLE_ENABLE_MASK       0x00000001 /* QSPI Enable Bit Mask */
+
+#define GQSPI_GFIFO_LOW_BUS            BIT(14)
+#define GQSPI_GFIFO_CS_LOWER           BIT(12)
+#define GQSPI_GFIFO_UP_BUS             BIT(15)
+#define GQSPI_GFIFO_CS_UPPER           BIT(13)
+#define GQSPI_SPI_MODE_QSPI            (3 << 10)
+#define GQSPI_SPI_MODE_SPI             BIT(10)
+#define GQSPI_SPI_MODE_DUAL_SPI                (2 << 10)
+#define GQSPI_IMD_DATA_CS_ASSERT       5
+#define GQSPI_IMD_DATA_CS_DEASSERT     5
+#define GQSPI_GFIFO_TX                 BIT(16)
+#define GQSPI_GFIFO_RX                 BIT(17)
+#define GQSPI_GFIFO_STRIPE_MASK                BIT(18)
+#define GQSPI_GFIFO_IMD_MASK           0xFF
+#define GQSPI_GFIFO_EXP_MASK           BIT(9)
+#define GQSPI_GFIFO_DATA_XFR_MASK      BIT(8)
+#define GQSPI_STRT_GEN_FIFO            BIT(28)
+#define GQSPI_GEN_FIFO_STRT_MOD                BIT(29)
+#define GQSPI_GFIFO_WP_HOLD            BIT(19)
+#define GQSPI_BAUD_DIV_MASK            (7 << 3)
+#define GQSPI_DFLT_BAUD_RATE_DIV       BIT(3)
+#define GQSPI_GFIFO_ALL_INT_MASK       0xFBE
+#define GQSPI_DMA_DST_I_STS_DONE       BIT(1)
+#define GQSPI_DMA_DST_I_STS_MASK       0xFE
+#define MODEBITS                       0x6
+
+#define GQSPI_GFIFO_SELECT             BIT(0)
+#define GQSPI_FIFO_THRESHOLD           1
+
+#define SPI_XFER_ON_BOTH               0
+#define SPI_XFER_ON_LOWER              1
+#define SPI_XFER_ON_UPPER              2
+
+#define GQSPI_DMA_ALIGN                        0x4
+#define GQSPI_MAX_BAUD_RATE_VAL                7
+#define GQSPI_DFLT_BAUD_RATE_VAL       2
+
+#define GQSPI_TIMEOUT                  100000000
+
+#define GQSPI_BAUD_DIV_SHIFT           2
+#define GQSPI_LPBK_DLY_ADJ_LPBK_SHIFT  5
+#define GQSPI_LPBK_DLY_ADJ_DLY_1       0x2
+#define GQSPI_LPBK_DLY_ADJ_DLY_1_SHIFT 3
+#define GQSPI_LPBK_DLY_ADJ_DLY_0       0x3
+#define GQSPI_USE_DATA_DLY             0x1
+#define GQSPI_USE_DATA_DLY_SHIFT       31
+#define GQSPI_DATA_DLY_ADJ_VALUE       0x2
+#define GQSPI_DATA_DLY_ADJ_SHIFT       28
+#define TAP_DLY_BYPASS_LQSPI_RX_VALUE  0x1
+#define TAP_DLY_BYPASS_LQSPI_RX_SHIFT  2
+#define GQSPI_DATA_DLY_ADJ_OFST                0x000001F8
+#define IOU_TAPDLY_BYPASS_OFST         0xFF180390
+#define GQSPI_LPBK_DLY_ADJ_LPBK_MASK   0x00000020
+#define GQSPI_FREQ_40MHZ               40000000
+#define GQSPI_FREQ_100MHZ              100000000
+#define GQSPI_FREQ_150MHZ              150000000
+#define IOU_TAPDLY_BYPASS_MASK         0x7
+
+#define GQSPI_REG_OFFSET               0x100
+#define GQSPI_DMA_REG_OFFSET           0x800
+
+/* QSPI register offsets */
+struct zynqmp_qspi_regs {
+       u32 confr;      /* 0x00 */
+       u32 isr;        /* 0x04 */
+       u32 ier;        /* 0x08 */
+       u32 idisr;      /* 0x0C */
+       u32 imaskr;     /* 0x10 */
+       u32 enbr;       /* 0x14 */
+       u32 dr;         /* 0x18 */
+       u32 txd0r;      /* 0x1C */
+       u32 drxr;       /* 0x20 */
+       u32 sicr;       /* 0x24 */
+       u32 txftr;      /* 0x28 */
+       u32 rxftr;      /* 0x2C */
+       u32 gpior;      /* 0x30 */
+       u32 reserved0;  /* 0x34 */
+       u32 lpbkdly;    /* 0x38 */
+       u32 reserved1;  /* 0x3C */
+       u32 genfifo;    /* 0x40 */
+       u32 gqspisel;   /* 0x44 */
+       u32 reserved2;  /* 0x48 */
+       u32 gqfifoctrl; /* 0x4C */
+       u32 gqfthr;     /* 0x50 */
+       u32 gqpollcfg;  /* 0x54 */
+       u32 gqpollto;   /* 0x58 */
+       u32 gqxfersts;  /* 0x5C */
+       u32 gqfifosnap; /* 0x60 */
+       u32 gqrxcpy;    /* 0x64 */
+       u32 reserved3[36];      /* 0x68 */
+       u32 gqspidlyadj;        /* 0xF8 */
+};
+
+struct zynqmp_qspi_dma_regs {
+       u32 dmadst;     /* 0x00 */
+       u32 dmasize;    /* 0x04 */
+       u32 dmasts;     /* 0x08 */
+       u32 dmactrl;    /* 0x0C */
+       u32 reserved0;  /* 0x10 */
+       u32 dmaisr;     /* 0x14 */
+       u32 dmaier;     /* 0x18 */
+       u32 dmaidr;     /* 0x1C */
+       u32 dmaimr;     /* 0x20 */
+       u32 dmactrl2;   /* 0x24 */
+       u32 dmadstmsb;  /* 0x28 */
+};
+
+DECLARE_GLOBAL_DATA_PTR;
+
+struct zynqmp_qspi_platdata {
+       struct zynqmp_qspi_regs *regs;
+       struct zynqmp_qspi_dma_regs *dma_regs;
+       u32 frequency;
+       u32 speed_hz;
+};
+
+struct zynqmp_qspi_priv {
+       struct zynqmp_qspi_regs *regs;
+       struct zynqmp_qspi_dma_regs *dma_regs;
+       const void *tx_buf;
+       void *rx_buf;
+       unsigned int len;
+       int bytes_to_transfer;
+       int bytes_to_receive;
+       unsigned int is_inst;
+       unsigned int cs_change:1;
+};
+
+static int zynqmp_qspi_ofdata_to_platdata(struct udevice *bus)
+{
+       struct zynqmp_qspi_platdata *plat = bus->platdata;
+
+       debug("%s\n", __func__);
+
+       plat->regs = (struct zynqmp_qspi_regs *)(devfdt_get_addr(bus) +
+                                                GQSPI_REG_OFFSET);
+       plat->dma_regs = (struct zynqmp_qspi_dma_regs *)
+                         (devfdt_get_addr(bus) + GQSPI_DMA_REG_OFFSET);
+
+       return 0;
+}
+
+static void zynqmp_qspi_init_hw(struct zynqmp_qspi_priv *priv)
+{
+       u32 config_reg;
+       struct zynqmp_qspi_regs *regs = priv->regs;
+
+       writel(GQSPI_GFIFO_SELECT, &regs->gqspisel);
+       writel(GQSPI_GFIFO_ALL_INT_MASK, &regs->idisr);
+       writel(GQSPI_FIFO_THRESHOLD, &regs->txftr);
+       writel(GQSPI_FIFO_THRESHOLD, &regs->rxftr);
+       writel(GQSPI_GFIFO_ALL_INT_MASK, &regs->isr);
+
+       config_reg = readl(&regs->confr);
+       config_reg &= ~(GQSPI_GFIFO_STRT_MODE_MASK |
+                       GQSPI_CONFIG_MODE_EN_MASK);
+       config_reg |= GQSPI_CONFIG_DMA_MODE |
+                     GQSPI_GFIFO_WP_HOLD |
+                     GQSPI_DFLT_BAUD_RATE_DIV;
+       writel(config_reg, &regs->confr);
+
+       writel(GQSPI_ENABLE_ENABLE_MASK, &regs->enbr);
+}
+
+static u32 zynqmp_qspi_bus_select(struct zynqmp_qspi_priv *priv)
+{
+       u32 gqspi_fifo_reg = 0;
+
+       gqspi_fifo_reg = GQSPI_GFIFO_LOW_BUS |
+                        GQSPI_GFIFO_CS_LOWER;
+
+       return gqspi_fifo_reg;
+}
+
+static void zynqmp_qspi_fill_gen_fifo(struct zynqmp_qspi_priv *priv,
+                                     u32 gqspi_fifo_reg)
+{
+       struct zynqmp_qspi_regs *regs = priv->regs;
+       int ret = 0;
+
+       ret = wait_for_bit_le32(&regs->isr, GQSPI_IXR_GFEMTY_MASK, 1,
+                               GQSPI_TIMEOUT, 1);
+       if (ret)
+               printf("%s Timeout\n", __func__);
+
+       writel(gqspi_fifo_reg, &regs->genfifo);
+}
+
+static void zynqmp_qspi_chipselect(struct zynqmp_qspi_priv *priv, int is_on)
+{
+       u32 gqspi_fifo_reg = 0;
+
+       if (is_on) {
+               gqspi_fifo_reg = zynqmp_qspi_bus_select(priv);
+               gqspi_fifo_reg |= GQSPI_SPI_MODE_SPI |
+                                 GQSPI_IMD_DATA_CS_ASSERT;
+       } else {
+               gqspi_fifo_reg = GQSPI_GFIFO_LOW_BUS;
+               gqspi_fifo_reg |= GQSPI_IMD_DATA_CS_DEASSERT;
+       }
+
+       debug("GFIFO_CMD_CS: 0x%x\n", gqspi_fifo_reg);
+
+       zynqmp_qspi_fill_gen_fifo(priv, gqspi_fifo_reg);
+}
+
+void zynqmp_qspi_set_tapdelay(struct udevice *bus, u32 baudrateval)
+{
+       struct zynqmp_qspi_platdata *plat = bus->platdata;
+       struct zynqmp_qspi_priv *priv = dev_get_priv(bus);
+       struct zynqmp_qspi_regs *regs = priv->regs;
+       u32 tapdlybypass = 0, lpbkdlyadj = 0, datadlyadj = 0, clk_rate;
+       u32 reqhz = 0;
+
+       clk_rate = plat->frequency;
+       reqhz = (clk_rate / (GQSPI_BAUD_DIV_SHIFT << baudrateval));
+
+       debug("%s, req_hz:%d, clk_rate:%d, baudrateval:%d\n",
+             __func__, reqhz, clk_rate, baudrateval);
+
+       if (reqhz < GQSPI_FREQ_40MHZ) {
+               zynqmp_mmio_read(IOU_TAPDLY_BYPASS_OFST, &tapdlybypass);
+               tapdlybypass |= (TAP_DLY_BYPASS_LQSPI_RX_VALUE <<
+                               TAP_DLY_BYPASS_LQSPI_RX_SHIFT);
+       } else if (reqhz < GQSPI_FREQ_100MHZ) {
+               zynqmp_mmio_read(IOU_TAPDLY_BYPASS_OFST, &tapdlybypass);
+               tapdlybypass |= (TAP_DLY_BYPASS_LQSPI_RX_VALUE <<
+                               TAP_DLY_BYPASS_LQSPI_RX_SHIFT);
+               lpbkdlyadj = readl(&regs->lpbkdly);
+               lpbkdlyadj |= (GQSPI_LPBK_DLY_ADJ_LPBK_MASK);
+               datadlyadj = readl(&regs->gqspidlyadj);
+               datadlyadj |= ((GQSPI_USE_DATA_DLY << GQSPI_USE_DATA_DLY_SHIFT)
+                               | (GQSPI_DATA_DLY_ADJ_VALUE <<
+                                       GQSPI_DATA_DLY_ADJ_SHIFT));
+       } else if (reqhz < GQSPI_FREQ_150MHZ) {
+               lpbkdlyadj = readl(&regs->lpbkdly);
+               lpbkdlyadj |= ((GQSPI_LPBK_DLY_ADJ_LPBK_MASK) |
+                               GQSPI_LPBK_DLY_ADJ_DLY_0);
+       }
+
+       zynqmp_mmio_write(IOU_TAPDLY_BYPASS_OFST, IOU_TAPDLY_BYPASS_MASK,
+                         tapdlybypass);
+       writel(lpbkdlyadj, &regs->lpbkdly);
+       writel(datadlyadj, &regs->gqspidlyadj);
+}
+
+static int zynqmp_qspi_set_speed(struct udevice *bus, uint speed)
+{
+       struct zynqmp_qspi_platdata *plat = bus->platdata;
+       struct zynqmp_qspi_priv *priv = dev_get_priv(bus);
+       struct zynqmp_qspi_regs *regs = priv->regs;
+       u32 confr;
+       u8 baud_rate_val = 0;
+
+       debug("%s\n", __func__);
+       if (speed > plat->frequency)
+               speed = plat->frequency;
+
+       /* Set the clock frequency */
+       confr = readl(&regs->confr);
+       if (speed == 0) {
+               /* Set baudrate x8, if the freq is 0 */
+               baud_rate_val = GQSPI_DFLT_BAUD_RATE_VAL;
+       } else if (plat->speed_hz != speed) {
+               while ((baud_rate_val < 8) &&
+                      ((plat->frequency /
+                      (2 << baud_rate_val)) > speed))
+                       baud_rate_val++;
+
+               if (baud_rate_val > GQSPI_MAX_BAUD_RATE_VAL)
+                       baud_rate_val = GQSPI_DFLT_BAUD_RATE_VAL;
+
+               plat->speed_hz = plat->frequency / (2 << baud_rate_val);
+       }
+       confr &= ~GQSPI_BAUD_DIV_MASK;
+       confr |= (baud_rate_val << 3);
+       writel(confr, &regs->confr);
+
+       zynqmp_qspi_set_tapdelay(bus, baud_rate_val);
+       debug("regs=%p, speed=%d\n", priv->regs, plat->speed_hz);
+
+       return 0;
+}
+
+static int zynqmp_qspi_probe(struct udevice *bus)
+{
+       struct zynqmp_qspi_platdata *plat = dev_get_platdata(bus);
+       struct zynqmp_qspi_priv *priv = dev_get_priv(bus);
+       struct clk clk;
+       unsigned long clock;
+       int ret;
+
+       debug("%s: bus:%p, priv:%p\n", __func__, bus, priv);
+
+       priv->regs = plat->regs;
+       priv->dma_regs = plat->dma_regs;
+
+       ret = clk_get_by_index(bus, 0, &clk);
+       if (ret < 0) {
+               dev_err(dev, "failed to get clock\n");
+               return ret;
+       }
+
+       clock = clk_get_rate(&clk);
+       if (IS_ERR_VALUE(clock)) {
+               dev_err(dev, "failed to get rate\n");
+               return clock;
+       }
+       debug("%s: CLK %ld\n", __func__, clock);
+
+       ret = clk_enable(&clk);
+       if (ret && ret != -ENOSYS) {
+               dev_err(dev, "failed to enable clock\n");
+               return ret;
+       }
+       plat->frequency = clock;
+       plat->speed_hz = plat->frequency / 2;
+
+       /* init the zynq spi hw */
+       zynqmp_qspi_init_hw(priv);
+
+       return 0;
+}
+
+static int zynqmp_qspi_set_mode(struct udevice *bus, uint mode)
+{
+       struct zynqmp_qspi_priv *priv = dev_get_priv(bus);
+       struct zynqmp_qspi_regs *regs = priv->regs;
+       u32 confr;
+
+       debug("%s\n", __func__);
+       /* Set the SPI Clock phase and polarities */
+       confr = readl(&regs->confr);
+       confr &= ~(GQSPI_CONFIG_CPHA_MASK |
+                  GQSPI_CONFIG_CPOL_MASK);
+
+       if (mode & SPI_CPHA)
+               confr |= GQSPI_CONFIG_CPHA_MASK;
+       if (mode & SPI_CPOL)
+               confr |= GQSPI_CONFIG_CPOL_MASK;
+
+       writel(confr, &regs->confr);
+
+       return 0;
+}
+
+static int zynqmp_qspi_fill_tx_fifo(struct zynqmp_qspi_priv *priv, u32 size)
+{
+       u32 data;
+       int ret = 0;
+       struct zynqmp_qspi_regs *regs = priv->regs;
+       u32 *buf = (u32 *)priv->tx_buf;
+       u32 len = size;
+
+       debug("TxFIFO: 0x%x, size: 0x%x\n", readl(&regs->isr),
+             size);
+
+       while (size) {
+               ret = wait_for_bit_le32(&regs->isr, GQSPI_IXR_TXNFULL_MASK, 1,
+                                       GQSPI_TIMEOUT, 1);
+               if (ret) {
+                       printf("%s: Timeout\n", __func__);
+                       return ret;
+               }
+
+               if (size >= 4) {
+                       writel(*buf, &regs->txd0r);
+                       buf++;
+                       size -= 4;
+               } else {
+                       switch (size) {
+                       case 1:
+                               data = *((u8 *)buf);
+                               buf += 1;
+                               data |= GENMASK(31, 8);
+                               break;
+                       case 2:
+                               data = *((u16 *)buf);
+                               buf += 2;
+                               data |= GENMASK(31, 16);
+                               break;
+                       case 3:
+                               data = *((u16 *)buf);
+                               buf += 2;
+                               data |= (*((u8 *)buf) << 16);
+                               buf += 1;
+                               data |= GENMASK(31, 24);
+                               break;
+                       }
+                       writel(data, &regs->txd0r);
+                       size = 0;
+               }
+       }
+
+       priv->tx_buf += len;
+       return 0;
+}
+
+static void zynqmp_qspi_genfifo_cmd(struct zynqmp_qspi_priv *priv)
+{
+       u32 gen_fifo_cmd;
+       u32 bytecount = 0;
+
+       while (priv->len) {
+               gen_fifo_cmd = zynqmp_qspi_bus_select(priv);
+               gen_fifo_cmd |= GQSPI_GFIFO_TX | GQSPI_SPI_MODE_SPI;
+               gen_fifo_cmd |= *(u8 *)priv->tx_buf;
+               bytecount++;
+               priv->len--;
+               priv->tx_buf = (u8 *)priv->tx_buf + 1;
+
+               debug("GFIFO_CMD_Cmd = 0x%x\n", gen_fifo_cmd);
+
+               zynqmp_qspi_fill_gen_fifo(priv, gen_fifo_cmd);
+       }
+}
+
+static u32 zynqmp_qspi_calc_exp(struct zynqmp_qspi_priv *priv,
+                               u32 *gen_fifo_cmd)
+{
+       u32 expval = 8;
+       u32 len;
+
+       while (1) {
+               if (priv->len > 255) {
+                       if (priv->len & (1 << expval)) {
+                               *gen_fifo_cmd &= ~GQSPI_GFIFO_IMD_MASK;
+                               *gen_fifo_cmd |= GQSPI_GFIFO_EXP_MASK;
+                               *gen_fifo_cmd |= expval;
+                               priv->len -= (1 << expval);
+                               return expval;
+                       }
+                       expval++;
+               } else {
+                       *gen_fifo_cmd &= ~(GQSPI_GFIFO_IMD_MASK |
+                                         GQSPI_GFIFO_EXP_MASK);
+                       *gen_fifo_cmd |= (u8)priv->len;
+                       len = (u8)priv->len;
+                       priv->len  = 0;
+                       return len;
+               }
+       }
+}
+
+static int zynqmp_qspi_genfifo_fill_tx(struct zynqmp_qspi_priv *priv)
+{
+       u32 gen_fifo_cmd;
+       u32 len;
+       int ret = 0;
+
+       gen_fifo_cmd = zynqmp_qspi_bus_select(priv);
+       gen_fifo_cmd |= GQSPI_GFIFO_TX |
+                       GQSPI_GFIFO_DATA_XFR_MASK;
+
+       gen_fifo_cmd |= GQSPI_SPI_MODE_SPI;
+
+       while (priv->len) {
+               len = zynqmp_qspi_calc_exp(priv, &gen_fifo_cmd);
+               zynqmp_qspi_fill_gen_fifo(priv, gen_fifo_cmd);
+
+               debug("GFIFO_CMD_TX:0x%x\n", gen_fifo_cmd);
+
+               if (gen_fifo_cmd & GQSPI_GFIFO_EXP_MASK)
+                       ret = zynqmp_qspi_fill_tx_fifo(priv,
+                                                      1 << len);
+               else
+                       ret = zynqmp_qspi_fill_tx_fifo(priv,
+                                                      len);
+
+               if (ret)
+                       return ret;
+       }
+       return ret;
+}
+
+static int zynqmp_qspi_start_dma(struct zynqmp_qspi_priv *priv,
+                                u32 gen_fifo_cmd, u32 *buf)
+{
+       u32 addr;
+       u32 size, len;
+       u32 actuallen = priv->len;
+       int ret = 0;
+       struct zynqmp_qspi_dma_regs *dma_regs = priv->dma_regs;
+
+       writel((unsigned long)buf, &dma_regs->dmadst);
+       writel(roundup(priv->len, ARCH_DMA_MINALIGN), &dma_regs->dmasize);
+       writel(GQSPI_DMA_DST_I_STS_MASK, &dma_regs->dmaier);
+       addr = (unsigned long)buf;
+       size = roundup(priv->len, ARCH_DMA_MINALIGN);
+       flush_dcache_range(addr, addr + size);
+
+       while (priv->len) {
+               len = zynqmp_qspi_calc_exp(priv, &gen_fifo_cmd);
+               if (!(gen_fifo_cmd & GQSPI_GFIFO_EXP_MASK) &&
+                   (len % ARCH_DMA_MINALIGN)) {
+                       gen_fifo_cmd &= ~GENMASK(7, 0);
+                       gen_fifo_cmd |= roundup(len, ARCH_DMA_MINALIGN);
+               }
+               zynqmp_qspi_fill_gen_fifo(priv, gen_fifo_cmd);
+
+               debug("GFIFO_CMD_RX:0x%x\n", gen_fifo_cmd);
+       }
+
+       ret = wait_for_bit_le32(&dma_regs->dmaisr, GQSPI_DMA_DST_I_STS_DONE,
+                               1, GQSPI_TIMEOUT, 1);
+       if (ret) {
+               printf("DMA Timeout:0x%x\n", readl(&dma_regs->dmaisr));
+               return -ETIMEDOUT;
+       }
+
+       writel(GQSPI_DMA_DST_I_STS_DONE, &dma_regs->dmaisr);
+
+       debug("buf:0x%lx, rxbuf:0x%lx, *buf:0x%x len: 0x%x\n",
+             (unsigned long)buf, (unsigned long)priv->rx_buf, *buf,
+             actuallen);
+
+       if (buf != priv->rx_buf)
+               memcpy(priv->rx_buf, buf, actuallen);
+
+       return 0;
+}
+
+static int zynqmp_qspi_genfifo_fill_rx(struct zynqmp_qspi_priv *priv)
+{
+       u32 gen_fifo_cmd;
+       u32 *buf;
+       u32 actuallen = priv->len;
+
+       gen_fifo_cmd = zynqmp_qspi_bus_select(priv);
+       gen_fifo_cmd |= GQSPI_GFIFO_RX |
+                       GQSPI_GFIFO_DATA_XFR_MASK;
+
+       gen_fifo_cmd |= GQSPI_SPI_MODE_SPI;
+
+       /*
+        * Check if receive buffer is aligned to 4 byte and length
+        * is multiples of four byte as we are using dma to receive.
+        */
+       if (!((unsigned long)priv->rx_buf & (GQSPI_DMA_ALIGN - 1)) &&
+           !(actuallen % GQSPI_DMA_ALIGN)) {
+               buf = (u32 *)priv->rx_buf;
+               return zynqmp_qspi_start_dma(priv, gen_fifo_cmd, buf);
+       }
+
+       ALLOC_CACHE_ALIGN_BUFFER(u8, tmp, roundup(priv->len,
+                                                 GQSPI_DMA_ALIGN));
+       buf = (u32 *)tmp;
+       return zynqmp_qspi_start_dma(priv, gen_fifo_cmd, buf);
+}
+
+static int zynqmp_qspi_start_transfer(struct zynqmp_qspi_priv *priv)
+{
+       int ret = 0;
+
+       if (priv->is_inst) {
+               if (priv->tx_buf)
+                       zynqmp_qspi_genfifo_cmd(priv);
+               else
+                       return -EINVAL;
+       } else {
+               if (priv->tx_buf)
+                       ret = zynqmp_qspi_genfifo_fill_tx(priv);
+               else if (priv->rx_buf)
+                       ret = zynqmp_qspi_genfifo_fill_rx(priv);
+               else
+                       return -EINVAL;
+       }
+       return ret;
+}
+
+static int zynqmp_qspi_transfer(struct zynqmp_qspi_priv *priv)
+{
+       static unsigned int cs_change = 1;
+       int status = 0;
+
+       debug("%s\n", __func__);
+
+       while (1) {
+               /* Select the chip if required */
+               if (cs_change)
+                       zynqmp_qspi_chipselect(priv, 1);
+
+               cs_change = priv->cs_change;
+
+               if (!priv->tx_buf && !priv->rx_buf && priv->len) {
+                       status = -EINVAL;
+                       break;
+               }
+
+               /* Request the transfer */
+               if (priv->len) {
+                       status = zynqmp_qspi_start_transfer(priv);
+                       priv->is_inst = 0;
+                       if (status < 0)
+                               break;
+               }
+
+               if (cs_change)
+                       /* Deselect the chip */
+                       zynqmp_qspi_chipselect(priv, 0);
+               break;
+       }
+
+       return status;
+}
+
+static int zynqmp_qspi_claim_bus(struct udevice *dev)
+{
+       struct udevice *bus = dev->parent;
+       struct zynqmp_qspi_priv *priv = dev_get_priv(bus);
+       struct zynqmp_qspi_regs *regs = priv->regs;
+
+       writel(GQSPI_ENABLE_ENABLE_MASK, &regs->enbr);
+
+       return 0;
+}
+
+static int zynqmp_qspi_release_bus(struct udevice *dev)
+{
+       struct udevice *bus = dev->parent;
+       struct zynqmp_qspi_priv *priv = dev_get_priv(bus);
+       struct zynqmp_qspi_regs *regs = priv->regs;
+
+       writel(~GQSPI_ENABLE_ENABLE_MASK, &regs->enbr);
+
+       return 0;
+}
+
+int zynqmp_qspi_xfer(struct udevice *dev, unsigned int bitlen, const void *dout,
+                    void *din, unsigned long flags)
+{
+       struct udevice *bus = dev->parent;
+       struct zynqmp_qspi_priv *priv = dev_get_priv(bus);
+
+       debug("%s: priv: 0x%08lx bitlen: %d dout: 0x%08lx ", __func__,
+             (unsigned long)priv, bitlen, (unsigned long)dout);
+       debug("din: 0x%08lx flags: 0x%lx\n", (unsigned long)din, flags);
+
+       priv->tx_buf = dout;
+       priv->rx_buf = din;
+       priv->len = bitlen / 8;
+
+       /*
+        * Assume that the beginning of a transfer with bits to
+        * transmit must contain a device command.
+        */
+       if (dout && flags & SPI_XFER_BEGIN)
+               priv->is_inst = 1;
+       else
+               priv->is_inst = 0;
+
+       if (flags & SPI_XFER_END)
+               priv->cs_change = 1;
+       else
+               priv->cs_change = 0;
+
+       zynqmp_qspi_transfer(priv);
+
+       return 0;
+}
+
+static const struct dm_spi_ops zynqmp_qspi_ops = {
+       .claim_bus      = zynqmp_qspi_claim_bus,
+       .release_bus    = zynqmp_qspi_release_bus,
+       .xfer           = zynqmp_qspi_xfer,
+       .set_speed      = zynqmp_qspi_set_speed,
+       .set_mode       = zynqmp_qspi_set_mode,
+};
+
+static const struct udevice_id zynqmp_qspi_ids[] = {
+       { .compatible = "xlnx,zynqmp-qspi-1.0" },
+       { }
+};
+
+U_BOOT_DRIVER(zynqmp_qspi) = {
+       .name   = "zynqmp_qspi",
+       .id     = UCLASS_SPI,
+       .of_match = zynqmp_qspi_ids,
+       .ops    = &zynqmp_qspi_ops,
+       .ofdata_to_platdata = zynqmp_qspi_ofdata_to_platdata,
+       .platdata_auto_alloc_size = sizeof(struct zynqmp_qspi_platdata),
+       .priv_auto_alloc_size = sizeof(struct zynqmp_qspi_priv),
+       .probe  = zynqmp_qspi_probe,
+};