spi: Zap sh_spi driver
[oweals/u-boot.git] / drivers / spi / ti_qspi.c
index b5c974ce3839b9af2f9043e993dd4b0b4087c713..0db0de8f1bf1aa963a69c712a1be695bc8eeb107 100644 (file)
@@ -1,27 +1,39 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * TI QSPI driver
  *
  * Copyright (C) 2013, Texas Instruments, Incorporated
- *
- * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <common.h>
+#include <cpu_func.h>
+#include <log.h>
+#include <asm/cache.h>
 #include <asm/io.h>
 #include <asm/arch/omap.h>
 #include <malloc.h>
 #include <spi.h>
+#include <spi-mem.h>
 #include <dm.h>
 #include <asm/gpio.h>
 #include <asm/omap_gpio.h>
 #include <asm/omap_common.h>
 #include <asm/ti-common/ti-edma3.h>
+#include <linux/bitops.h>
+#include <linux/err.h>
+#include <linux/kernel.h>
+#include <regmap.h>
+#include <syscon.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
 /* ti qpsi register bit masks */
 #define QSPI_TIMEOUT                    2000000
-#define QSPI_FCLK                       192000000
+#define QSPI_FCLK                      192000000
+#define QSPI_DRA7XX_FCLK                76800000
+#define QSPI_WLEN_MAX_BITS             128
+#define QSPI_WLEN_MAX_BYTES            (QSPI_WLEN_MAX_BITS >> 3)
+#define QSPI_WLEN_MASK                 QSPI_WLEN(QSPI_WLEN_MAX_BITS)
 /* clock control */
 #define QSPI_CLK_EN                     BIT(31)
 #define QSPI_CLK_DIV_MAX                0xffff
@@ -34,7 +46,6 @@ DECLARE_GLOBAL_DATA_PTR;
 #define QSPI_INVAL                      (4 << 16)
 #define QSPI_RD_QUAD                    (7 << 16)
 /* device control */
-#define QSPI_DD(m, n)                   (m << (3 + n*8))
 #define QSPI_CKPHA(n)                   (1 << (2 + n*8))
 #define QSPI_CSPOL(n)                   (1 << (1 + n*8))
 #define QSPI_CKPOL(n)                   (1 << (n*8))
@@ -45,23 +56,15 @@ DECLARE_GLOBAL_DATA_PTR;
 #define QSPI_XFER_DONE                  QSPI_WC
 #define MM_SWITCH                       0x01
 #define MEM_CS(cs)                      ((cs + 1) << 8)
-#define MEM_CS_UNSELECT                 0xfffff0ff
-#define MMAP_START_ADDR_DRA            0x5c000000
-#define MMAP_START_ADDR_AM43x          0x30000000
-#define CORE_CTRL_IO                    0x4a002558
-
-#define QSPI_CMD_READ                   (0x3 << 0)
-#define QSPI_CMD_READ_DUAL             (0x6b << 0)
-#define QSPI_CMD_READ_QUAD              (0x6c << 0)
-#define QSPI_CMD_READ_FAST              (0x0b << 0)
-#define QSPI_SETUP0_NUM_A_BYTES         (0x3 << 8)
-#define QSPI_SETUP0_NUM_D_BYTES_NO_BITS (0x0 << 10)
-#define QSPI_SETUP0_NUM_D_BYTES_8_BITS  (0x1 << 10)
+#define MEM_CS_UNSELECT                 0xfffff8ff
+
 #define QSPI_SETUP0_READ_NORMAL         (0x0 << 12)
 #define QSPI_SETUP0_READ_DUAL           (0x1 << 12)
 #define QSPI_SETUP0_READ_QUAD           (0x3 << 12)
-#define QSPI_CMD_WRITE                  (0x12 << 16)
-#define QSPI_NUM_DUMMY_BITS             (0x0 << 24)
+#define QSPI_SETUP0_ADDR_SHIFT         (8)
+#define QSPI_SETUP0_DBITS_SHIFT                (10)
+
+#define TI_QSPI_SETUP_REG(priv, cs)    (&(priv)->base->setup0 + (cs))
 
 /* ti qspi register set */
 struct ti_qspi_regs {
@@ -92,43 +95,41 @@ struct ti_qspi_regs {
 
 /* ti qspi priv */
 struct ti_qspi_priv {
-#ifndef CONFIG_DM_SPI
-       struct spi_slave slave;
-#else
        void *memory_map;
+       size_t mmap_size;
        uint max_hz;
        u32 num_cs;
-#endif
        struct ti_qspi_regs *base;
        void *ctrl_mod_mmap;
+       ulong fclk;
        unsigned int mode;
        u32 cmd;
        u32 dc;
 };
 
-static void ti_spi_set_speed(struct ti_qspi_priv *priv, uint hz)
+static int ti_qspi_set_speed(struct udevice *bus, uint hz)
 {
+       struct ti_qspi_priv *priv = dev_get_priv(bus);
        uint clk_div;
 
-       debug("ti_spi_set_speed: hz: %d, clock divider %d\n", hz, clk_div);
-
        if (!hz)
                clk_div = 0;
        else
-               clk_div = (QSPI_FCLK / hz) - 1;
+               clk_div = DIV_ROUND_UP(priv->fclk, hz) - 1;
+
+       /* truncate clk_div value to QSPI_CLK_DIV_MAX */
+       if (clk_div > QSPI_CLK_DIV_MAX)
+               clk_div = QSPI_CLK_DIV_MAX;
+
+       debug("ti_spi_set_speed: hz: %d, clock divider %d\n", hz, clk_div);
 
        /* disable SCLK */
        writel(readl(&priv->base->clk_ctrl) & ~QSPI_CLK_EN,
               &priv->base->clk_ctrl);
-
-       /* assign clk_div values */
-       if (clk_div < 0)
-               clk_div = 0;
-       else if (clk_div > QSPI_CLK_DIV_MAX)
-               clk_div = QSPI_CLK_DIV_MAX;
-
-       /* enable SCLK */
+       /* enable SCLK and program the clk divider */
        writel(QSPI_CLK_EN | clk_div, &priv->base->clk_ctrl);
+
+       return 0;
 }
 
 static void ti_qspi_cs_deactivate(struct ti_qspi_priv *priv)
@@ -138,38 +139,6 @@ static void ti_qspi_cs_deactivate(struct ti_qspi_priv *priv)
        readl(&priv->base->cmd);
 }
 
-static int __ti_qspi_set_mode(struct ti_qspi_priv *priv, unsigned int mode)
-{
-       priv->dc = 0;
-       if (mode & SPI_CPHA)
-               priv->dc |= QSPI_CKPHA(0);
-       if (mode & SPI_CPOL)
-               priv->dc |= QSPI_CKPOL(0);
-       if (mode & SPI_CS_HIGH)
-               priv->dc |= QSPI_CSPOL(0);
-
-       return 0;
-}
-
-static int __ti_qspi_claim_bus(struct ti_qspi_priv *priv, int cs)
-{
-       writel(priv->dc, &priv->base->dc);
-       writel(0, &priv->base->cmd);
-       writel(0, &priv->base->data);
-
-       priv->dc <<= cs * 8;
-       writel(priv->dc, &priv->base->dc);
-
-       return 0;
-}
-
-static void __ti_qspi_release_bus(struct ti_qspi_priv *priv)
-{
-       writel(0, &priv->base->dc);
-       writel(0, &priv->base->cmd);
-       writel(0, &priv->base->data);
-}
-
 static void ti_qspi_ctrl_mode_mmap(void *ctrl_mod_mmap, int cs, bool enable)
 {
        u32 val;
@@ -182,27 +151,25 @@ static void ti_qspi_ctrl_mode_mmap(void *ctrl_mod_mmap, int cs, bool enable)
        writel(val, ctrl_mod_mmap);
 }
 
-static int __ti_qspi_xfer(struct ti_qspi_priv *priv, unsigned int bitlen,
-                       const void *dout, void *din, unsigned long flags,
-                       u32 cs)
+static int ti_qspi_xfer(struct udevice *dev, unsigned int bitlen,
+                       const void *dout, void *din, unsigned long flags)
 {
+       struct dm_spi_slave_platdata *slave = dev_get_parent_platdata(dev);
+       struct ti_qspi_priv *priv;
+       struct udevice *bus;
        uint words = bitlen >> 3; /* fixed 8-bit word length */
        const uchar *txp = dout;
        uchar *rxp = din;
        uint status;
        int timeout;
+       unsigned int cs = slave->cs;
+
+       bus = dev->parent;
+       priv = dev_get_priv(bus);
 
-       /* Setup mmap flags */
-       if (flags & SPI_XFER_MMAP) {
-               writel(MM_SWITCH, &priv->base->memswitch);
-               if (priv->ctrl_mod_mmap)
-                       ti_qspi_ctrl_mode_mmap(priv->ctrl_mod_mmap, cs, true);
-               return 0;
-       } else if (flags & SPI_XFER_MMAP_END) {
-               writel(~MM_SWITCH, &priv->base->memswitch);
-               if (priv->ctrl_mod_mmap)
-                       ti_qspi_ctrl_mode_mmap(priv->ctrl_mod_mmap, cs, false);
-               return 0;
+       if (cs > priv->num_cs) {
+               debug("invalid qspi chip select\n");
+               return -EINVAL;
        }
 
        if (bitlen == 0)
@@ -221,20 +188,34 @@ static int __ti_qspi_xfer(struct ti_qspi_priv *priv, unsigned int bitlen,
                priv->cmd |= QSPI_3_PIN;
        priv->cmd |= 0xfff;
 
-/* FIXME: This delay is required for successfull
- * completion of read/write/erase. Once its root
- * caused, it will be remove from the driver.
- */
-#ifdef CONFIG_AM43XX
-       udelay(100);
-#endif
-       while (words--) {
+       while (words) {
+               u8 xfer_len = 0;
+
                if (txp) {
-                       debug("tx cmd %08x dc %08x data %02x\n",
-                             priv->cmd | QSPI_WR_SNGL, priv->dc, *txp);
-                       writel(*txp++, &priv->base->data);
-                       writel(priv->cmd | QSPI_WR_SNGL,
-                              &priv->base->cmd);
+                       u32 cmd = priv->cmd;
+
+                       if (words >= QSPI_WLEN_MAX_BYTES) {
+                               u32 *txbuf = (u32 *)txp;
+                               u32 data;
+
+                               data = cpu_to_be32(*txbuf++);
+                               writel(data, &priv->base->data3);
+                               data = cpu_to_be32(*txbuf++);
+                               writel(data, &priv->base->data2);
+                               data = cpu_to_be32(*txbuf++);
+                               writel(data, &priv->base->data1);
+                               data = cpu_to_be32(*txbuf++);
+                               writel(data, &priv->base->data);
+                               cmd &= ~QSPI_WLEN_MASK;
+                               cmd |= QSPI_WLEN(QSPI_WLEN_MAX_BITS);
+                               xfer_len = QSPI_WLEN_MAX_BYTES;
+                       } else {
+                               writeb(*txp, &priv->base->data);
+                               xfer_len = 1;
+                       }
+                       debug("tx cmd %08x dc %08x\n",
+                             cmd | QSPI_WR_SNGL, priv->dc);
+                       writel(cmd | QSPI_WR_SNGL, &priv->base->cmd);
                        status = readl(&priv->base->status);
                        timeout = QSPI_TIMEOUT;
                        while ((status & QSPI_WC_BUSY) != QSPI_XFER_DONE) {
@@ -244,16 +225,13 @@ static int __ti_qspi_xfer(struct ti_qspi_priv *priv, unsigned int bitlen,
                                }
                                status = readl(&priv->base->status);
                        }
+                       txp += xfer_len;
                        debug("tx done, status %08x\n", status);
                }
                if (rxp) {
-                       priv->cmd |= QSPI_RD_SNGL;
                        debug("rx cmd %08x dc %08x\n",
-                             priv->cmd, priv->dc);
-                       #ifdef CONFIG_DRA7XX
-                               udelay(500);
-                       #endif
-                       writel(priv->cmd, &priv->base->cmd);
+                             ((u32)(priv->cmd | QSPI_RD_SNGL)), priv->dc);
+                       writel(priv->cmd | QSPI_RD_SNGL, &priv->base->cmd);
                        status = readl(&priv->base->status);
                        timeout = QSPI_TIMEOUT;
                        while ((status & QSPI_WC_BUSY) != QSPI_XFER_DONE) {
@@ -264,9 +242,11 @@ static int __ti_qspi_xfer(struct ti_qspi_priv *priv, unsigned int bitlen,
                                status = readl(&priv->base->status);
                        }
                        *rxp++ = readl(&priv->base->data);
+                       xfer_len = 1;
                        debug("rx done, status %08x, read %02x\n",
                              status, *(rxp-1));
                }
+               words -= xfer_len;
        }
 
        /* Terminate frame */
@@ -277,9 +257,9 @@ static int __ti_qspi_xfer(struct ti_qspi_priv *priv, unsigned int bitlen,
 }
 
 /* TODO: control from sf layer to here through dm-spi */
-#ifdef CONFIG_TI_EDMA3
-void spi_flash_copy_mmap(void *data, void *offset, size_t len)
+static void ti_qspi_copy_mmap(void *data, void *offset, size_t len)
 {
+#if defined(CONFIG_TI_EDMA3) && !defined(CONFIG_DMA)
        unsigned int                    addr = (unsigned int) (data);
        unsigned int                    edma_slot_num = 1;
 
@@ -294,185 +274,88 @@ void spi_flash_copy_mmap(void *data, void *offset, size_t len)
 
        /* disable edma3 clocks */
        disable_edma3_clocks();
-
-       *((unsigned int *)offset) += len;
-}
-#endif
-
-#ifndef CONFIG_DM_SPI
-
-static inline struct ti_qspi_priv *to_ti_qspi_priv(struct spi_slave *slave)
-{
-       return container_of(slave, struct ti_qspi_priv, slave);
-}
-
-int spi_cs_is_valid(unsigned int bus, unsigned int cs)
-{
-       return 1;
-}
-
-void spi_cs_activate(struct spi_slave *slave)
-{
-       /* CS handled in xfer */
-       return;
-}
-
-void spi_cs_deactivate(struct spi_slave *slave)
-{
-       struct ti_qspi_priv *priv = to_ti_qspi_priv(slave);
-       ti_qspi_cs_deactivate(priv);
-}
-
-void spi_init(void)
-{
-       /* nothing to do */
-}
-
-static void ti_spi_setup_spi_register(struct ti_qspi_priv *priv)
-{
-       u32 memval = 0;
-
-#ifdef CONFIG_QSPI_QUAD_SUPPORT
-       struct spi_slave *slave = &priv->slave;
-       memval |= (QSPI_CMD_READ_QUAD | QSPI_SETUP0_NUM_A_BYTES |
-                       QSPI_SETUP0_NUM_D_BYTES_8_BITS |
-                       QSPI_SETUP0_READ_QUAD | QSPI_CMD_WRITE |
-                       QSPI_NUM_DUMMY_BITS);
-       slave->mode_rx = SPI_RX_QUAD;
 #else
-       memval |= QSPI_CMD_READ | QSPI_SETUP0_NUM_A_BYTES |
-                       QSPI_SETUP0_NUM_D_BYTES_NO_BITS |
-                       QSPI_SETUP0_READ_NORMAL | QSPI_CMD_WRITE |
-                       QSPI_NUM_DUMMY_BITS;
+       memcpy_fromio(data, offset, len);
 #endif
 
-       writel(memval, &priv->base->setup0);
-}
-
-struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
-                                 unsigned int max_hz, unsigned int mode)
-{
-       struct ti_qspi_priv *priv;
-
-#ifdef CONFIG_AM43XX
-       gpio_request(CONFIG_QSPI_SEL_GPIO, "qspi_gpio");
-       gpio_direction_output(CONFIG_QSPI_SEL_GPIO, 1);
-#endif
-
-       priv = spi_alloc_slave(struct ti_qspi_priv, bus, cs);
-       if (!priv) {
-               printf("SPI_error: Fail to allocate ti_qspi_priv\n");
-               return NULL;
-       }
-
-       priv->base = (struct ti_qspi_regs *)QSPI_BASE;
-       priv->mode = mode;
-#if defined(CONFIG_DRA7XX) || defined(CONFIG_AM57XX)
-       priv->ctrl_mod_mmap = (void *)CORE_CTRL_IO;
-       priv->slave.memory_map = (void *)MMAP_START_ADDR_DRA;
-#else
-       priv->slave.memory_map = (void *)MMAP_START_ADDR_AM43x;
-#endif
-
-       ti_spi_set_speed(priv, max_hz);
-
-#ifdef CONFIG_TI_SPI_MMAP
-       ti_spi_setup_spi_register(priv);
-#endif
-
-       return &priv->slave;
-}
-
-void spi_free_slave(struct spi_slave *slave)
-{
-       struct ti_qspi_priv *priv = to_ti_qspi_priv(slave);
-       free(priv);
-}
-
-int spi_claim_bus(struct spi_slave *slave)
-{
-       struct ti_qspi_priv *priv = to_ti_qspi_priv(slave);
-
-       debug("%s: bus:%i cs:%i\n", __func__, priv->slave.bus, priv->slave.cs);
-       __ti_qspi_set_mode(priv, priv->mode);
-       return __ti_qspi_claim_bus(priv, priv->slave.cs);
-}
-void spi_release_bus(struct spi_slave *slave)
-{
-       struct ti_qspi_priv *priv = to_ti_qspi_priv(slave);
-
-       debug("%s: bus:%i cs:%i\n", __func__, priv->slave.bus, priv->slave.cs);
-       __ti_qspi_release_bus(priv);
-}
-
-int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout,
-            void *din, unsigned long flags)
-{
-       struct ti_qspi_priv *priv = to_ti_qspi_priv(slave);
-
-       debug("spi_xfer: bus:%i cs:%i bitlen:%i flags:%lx\n",
-             priv->slave.bus, priv->slave.cs, bitlen, flags);
-       return __ti_qspi_xfer(priv, bitlen, dout, din, flags, priv->slave.cs);
+       *((unsigned int *)offset) += len;
 }
 
-#else /* CONFIG_DM_SPI */
-
-static void __ti_qspi_setup_memorymap(struct ti_qspi_priv *priv,
-                                     struct spi_slave *slave,
-                                     bool enable)
+static void ti_qspi_setup_mmap_read(struct ti_qspi_priv *priv, int cs,
+                                   u8 opcode, u8 data_nbits, u8 addr_width,
+                                   u8 dummy_bytes)
 {
-       u32 memval;
-       u32 mode = slave->mode_rx & (SPI_RX_QUAD | SPI_RX_DUAL);
-
-       if (!enable) {
-               writel(0, &priv->base->setup0);
-               return;
-       }
+       u32 memval = opcode;
 
-       memval = QSPI_SETUP0_NUM_A_BYTES | QSPI_CMD_WRITE | QSPI_NUM_DUMMY_BITS;
-
-       switch (mode) {
-       case SPI_RX_QUAD:
-               memval |= QSPI_CMD_READ_QUAD;
-               memval |= QSPI_SETUP0_NUM_D_BYTES_8_BITS;
+       switch (data_nbits) {
+       case 4:
                memval |= QSPI_SETUP0_READ_QUAD;
-               slave->mode_rx = SPI_RX_QUAD;
                break;
-       case SPI_RX_DUAL:
-               memval |= QSPI_CMD_READ_DUAL;
-               memval |= QSPI_SETUP0_NUM_D_BYTES_8_BITS;
+       case 2:
                memval |= QSPI_SETUP0_READ_DUAL;
                break;
        default:
-               memval |= QSPI_CMD_READ;
-               memval |= QSPI_SETUP0_NUM_D_BYTES_NO_BITS;
                memval |= QSPI_SETUP0_READ_NORMAL;
                break;
        }
 
-       writel(memval, &priv->base->setup0);
-}
+       memval |= ((addr_width - 1) << QSPI_SETUP0_ADDR_SHIFT |
+                  dummy_bytes << QSPI_SETUP0_DBITS_SHIFT);
 
+       writel(memval, TI_QSPI_SETUP_REG(priv, cs));
+}
 
-static int ti_qspi_set_speed(struct udevice *bus, uint max_hz)
+static int ti_qspi_set_mode(struct udevice *bus, uint mode)
 {
        struct ti_qspi_priv *priv = dev_get_priv(bus);
 
-       ti_spi_set_speed(priv, max_hz);
+       priv->dc = 0;
+       if (mode & SPI_CPHA)
+               priv->dc |= QSPI_CKPHA(0);
+       if (mode & SPI_CPOL)
+               priv->dc |= QSPI_CKPOL(0);
+       if (mode & SPI_CS_HIGH)
+               priv->dc |= QSPI_CSPOL(0);
 
        return 0;
 }
 
-static int ti_qspi_set_mode(struct udevice *bus, uint mode)
+static int ti_qspi_exec_mem_op(struct spi_slave *slave,
+                              const struct spi_mem_op *op)
 {
-       struct ti_qspi_priv *priv = dev_get_priv(bus);
-       return __ti_qspi_set_mode(priv, mode);
+       struct dm_spi_slave_platdata *slave_plat;
+       struct ti_qspi_priv *priv;
+       struct udevice *bus;
+       u32 from = 0;
+       int ret = 0;
+
+       bus = slave->dev->parent;
+       priv = dev_get_priv(bus);
+       slave_plat = dev_get_parent_platdata(slave->dev);
+
+       /* Only optimize read path. */
+       if (!op->data.nbytes || op->data.dir != SPI_MEM_DATA_IN ||
+           !op->addr.nbytes || op->addr.nbytes > 4)
+               return -ENOTSUPP;
+
+       /* Address exceeds MMIO window size, fall back to regular mode. */
+       from = op->addr.val;
+       if (from + op->data.nbytes > priv->mmap_size)
+               return -ENOTSUPP;
+
+       ti_qspi_setup_mmap_read(priv, slave_plat->cs, op->cmd.opcode,
+                               op->data.buswidth, op->addr.nbytes,
+                               op->dummy.nbytes);
+
+       ti_qspi_copy_mmap((void *)op->data.buf.in,
+                         (void *)priv->memory_map + from, op->data.nbytes);
+
+       return ret;
 }
 
 static int ti_qspi_claim_bus(struct udevice *dev)
 {
        struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev);
-       struct spi_slave *slave = dev_get_parent_priv(dev);
        struct ti_qspi_priv *priv;
        struct udevice *bus;
 
@@ -484,61 +367,105 @@ static int ti_qspi_claim_bus(struct udevice *dev)
                return -EINVAL;
        }
 
-       __ti_qspi_setup_memorymap(priv, slave, true);
+       writel(MM_SWITCH, &priv->base->memswitch);
+       if (priv->ctrl_mod_mmap)
+               ti_qspi_ctrl_mode_mmap(priv->ctrl_mod_mmap,
+                                      slave_plat->cs, true);
+
+       writel(priv->dc, &priv->base->dc);
+       writel(0, &priv->base->cmd);
+       writel(0, &priv->base->data);
 
-       return __ti_qspi_claim_bus(priv, slave_plat->cs);
+       priv->dc <<= slave_plat->cs * 8;
+       writel(priv->dc, &priv->base->dc);
+
+       return 0;
 }
 
 static int ti_qspi_release_bus(struct udevice *dev)
 {
-       struct spi_slave *slave = dev_get_parent_priv(dev);
+       struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev);
        struct ti_qspi_priv *priv;
        struct udevice *bus;
 
        bus = dev->parent;
        priv = dev_get_priv(bus);
 
-       __ti_qspi_setup_memorymap(priv, slave, false);
-       __ti_qspi_release_bus(priv);
+       writel(~MM_SWITCH, &priv->base->memswitch);
+       if (priv->ctrl_mod_mmap)
+               ti_qspi_ctrl_mode_mmap(priv->ctrl_mod_mmap,
+                                      slave_plat->cs, false);
+
+       writel(0, &priv->base->dc);
+       writel(0, &priv->base->cmd);
+       writel(0, &priv->base->data);
+       writel(0, TI_QSPI_SETUP_REG(priv, slave_plat->cs));
 
        return 0;
 }
 
-static int ti_qspi_xfer(struct udevice *dev, unsigned int bitlen,
-                       const void *dout, void *din, unsigned long flags)
+static int ti_qspi_probe(struct udevice *bus)
 {
-       struct dm_spi_slave_platdata *slave = dev_get_parent_platdata(dev);
-       struct ti_qspi_priv *priv;
-       struct udevice *bus;
-
-       bus = dev->parent;
-       priv = dev_get_priv(bus);
+       struct ti_qspi_priv *priv = dev_get_priv(bus);
 
-       if (slave->cs > priv->num_cs) {
-               debug("invalid qspi chip select\n");
-               return -EINVAL;
-       }
+       priv->fclk = dev_get_driver_data(bus);
 
-       return __ti_qspi_xfer(priv, bitlen, dout, din, flags, slave->cs);
+       return 0;
 }
 
-static int ti_qspi_probe(struct udevice *bus)
+static void *map_syscon_chipselects(struct udevice *bus)
 {
-       /* Nothing to do in probe */
-       return 0;
+#if CONFIG_IS_ENABLED(SYSCON)
+       struct udevice *syscon;
+       struct regmap *regmap;
+       const fdt32_t *cell;
+       int len, err;
+
+       err = uclass_get_device_by_phandle(UCLASS_SYSCON, bus,
+                                          "syscon-chipselects", &syscon);
+       if (err) {
+               debug("%s: unable to find syscon device (%d)\n", __func__,
+                     err);
+               return NULL;
+       }
+
+       regmap = syscon_get_regmap(syscon);
+       if (IS_ERR(regmap)) {
+               debug("%s: unable to find regmap (%ld)\n", __func__,
+                     PTR_ERR(regmap));
+               return NULL;
+       }
+
+       cell = fdt_getprop(gd->fdt_blob, dev_of_offset(bus),
+                          "syscon-chipselects", &len);
+       if (len < 2*sizeof(fdt32_t)) {
+               debug("%s: offset not available\n", __func__);
+               return NULL;
+       }
+
+       return fdtdec_get_number(cell + 1, 1) + regmap_get_range(regmap, 0);
+#else
+       fdt_addr_t addr;
+       addr = devfdt_get_addr_index(bus, 2);
+       return (addr == FDT_ADDR_T_NONE) ? NULL :
+               map_physmem(addr, 0, MAP_NOCACHE);
+#endif
 }
 
 static int ti_qspi_ofdata_to_platdata(struct udevice *bus)
 {
        struct ti_qspi_priv *priv = dev_get_priv(bus);
        const void *blob = gd->fdt_blob;
-       int node = bus->of_offset;
-       fdt_addr_t addr;
+       int node = dev_of_offset(bus);
+       fdt_addr_t mmap_addr;
+       fdt_addr_t mmap_size;
 
-       priv->base = (struct ti_qspi_regs *)dev_get_addr(bus);
-       priv->memory_map = (void *)dev_get_addr_index(bus, 1);
-       addr = dev_get_addr_index(bus, 2);
-       priv->ctrl_mod_mmap = (addr == FDT_ADDR_T_NONE) ? NULL : (void *)addr;
+       priv->ctrl_mod_mmap = map_syscon_chipselects(bus);
+       priv->base = map_physmem(devfdt_get_addr(bus),
+                                sizeof(struct ti_qspi_regs), MAP_NOCACHE);
+       mmap_addr = devfdt_get_addr_size_index(bus, 1, &mmap_size);
+       priv->memory_map = map_physmem(mmap_addr, mmap_size, MAP_NOCACHE);
+       priv->mmap_size = mmap_size;
 
        priv->max_hz = fdtdec_get_int(blob, node, "spi-max-frequency", -1);
        if (priv->max_hz < 0) {
@@ -553,15 +480,9 @@ static int ti_qspi_ofdata_to_platdata(struct udevice *bus)
        return 0;
 }
 
-static int ti_qspi_child_pre_probe(struct udevice *dev)
-{
-       struct spi_slave *slave = dev_get_parent_priv(dev);
-       struct udevice *bus = dev_get_parent(dev);
-       struct ti_qspi_priv *priv = dev_get_priv(bus);
-
-       slave->memory_map = priv->memory_map;
-       return 0;
-}
+static const struct spi_controller_mem_ops ti_qspi_mem_ops = {
+       .exec_op = ti_qspi_exec_mem_op,
+};
 
 static const struct dm_spi_ops ti_qspi_ops = {
        .claim_bus      = ti_qspi_claim_bus,
@@ -569,11 +490,12 @@ static const struct dm_spi_ops ti_qspi_ops = {
        .xfer           = ti_qspi_xfer,
        .set_speed      = ti_qspi_set_speed,
        .set_mode       = ti_qspi_set_mode,
+       .mem_ops        = &ti_qspi_mem_ops,
 };
 
 static const struct udevice_id ti_qspi_ids[] = {
-       { .compatible = "ti,dra7xxx-qspi" },
-       { .compatible = "ti,am4372-qspi" },
+       { .compatible = "ti,dra7xxx-qspi",      .data = QSPI_DRA7XX_FCLK},
+       { .compatible = "ti,am4372-qspi",       .data = QSPI_FCLK},
        { }
 };
 
@@ -585,6 +507,4 @@ U_BOOT_DRIVER(ti_qspi) = {
        .ofdata_to_platdata = ti_qspi_ofdata_to_platdata,
        .priv_auto_alloc_size = sizeof(struct ti_qspi_priv),
        .probe  = ti_qspi_probe,
-       .child_pre_probe = ti_qspi_child_pre_probe,
 };
-#endif /* CONFIG_DM_SPI */