[Patch v2 0/7] Transition of fsl qspi driver to spi-mem framework

[Patch v2 0/7] Transition of fsl qspi driver to spi-mem framework

[Kuldeep Singh]

This entire patch series migrate freescale qspi driver to spi-mem framework.

v2 version of series includes changes in qspi driver to have 1k size instead of
complete flash size so as to make driver independent of flash size. This also
makes it align with linux version of driver. Also added support for imx
platforms to set TDH bits correctly. There are other minor changes in commit
messages.

Dependency on patches[1][2]. These patches are required to resolve booting
crash observed in LS1012ARDB. One crash was related to pfe driver as it was
accessing flash memory directly and other was based on environment.
[1] https://patchwork.ozlabs.org/patch/1207610/
[2] https://patchwork.ozlabs.org/patch/1208299/

Patch 1 in series adds new qspi driver incorporating spi-mem framework and
also removal of old driver which was based on spi-nor. The driver is a ported
version of linux qspi driver. Initial port was done by Frieder. Now, no more
direct memory access to spi-nor memory is possible i.e accessing flash memory
using absolute address is not possible.

Patch 2 removes unused qspi config options.

Patch 3 moves FSL_QSPI to defconfig instead of defining it in header files.

Patch 4 removes unused num-cs property from imx platforms.

Patch 5 enables SPI_FLASH_SPANSION in ls1012a defconfig as FSL_QSPI is already
enabled.

Patch 6 enables SPI_FLASH_SPANSION in defconfigs of LS1046a boards instead of
defining in header files.

Patch 7 updates the device-tree properties treewide for layerscape boards by
aligning with linux device-tree properties.

Frieder Schrempf (1):
  imx: imx6sx: Remove unused 'num-cs' property

Kuldeep Singh (6):
  spi: Transform the FSL QuadSPI driver to use the SPI MEM API
  treewide: Remove unused FSL QSPI config options
  configs: ls1043a: Move CONFIG_FSL_QSPI to defconfig
  configs: ls1012a: Enable CONFIG_SPI_FLASH_SPANSION
  configs: ls1046a: Move SPI_FLASH_SPANSION to defconfig
  treewide: Update fsl qspi node dt properties as per spi-mem driver

 arch/arm/dts/fsl-ls1012a-2g5rdb.dts           |    5 +-
 arch/arm/dts/fsl-ls1012a-frdm.dtsi            |    5 +-
 arch/arm/dts/fsl-ls1012a-qds.dtsi             |    5 +-
 arch/arm/dts/fsl-ls1012a-rdb.dtsi             |    5 +-
 arch/arm/dts/fsl-ls1012a.dtsi                 |    4 +-
 arch/arm/dts/fsl-ls1043a-qds.dtsi             |    5 +-
 arch/arm/dts/fsl-ls1043a.dtsi                 |    6 +-
 arch/arm/dts/fsl-ls1046a-frwy.dts             |    5 +-
 arch/arm/dts/fsl-ls1046a-qds.dtsi             |    5 +-
 arch/arm/dts/fsl-ls1046a-rdb.dts              |    5 +-
 arch/arm/dts/fsl-ls1046a.dtsi                 |    4 +-
 arch/arm/dts/fsl-ls1088a-qds.dts              |    5 +-
 arch/arm/dts/fsl-ls1088a-rdb.dts              |    5 +-
 arch/arm/dts/fsl-ls1088a.dtsi                 |    2 +-
 arch/arm/dts/fsl-ls2080a-qds.dts              |    5 +-
 arch/arm/dts/fsl-ls2080a.dtsi                 |    4 +-
 arch/arm/dts/fsl-ls2088a-rdb-qspi.dts         |    5 +-
 arch/arm/dts/imx6sx-sabreauto-u-boot.dtsi     |    2 -
 arch/arm/dts/imx6sx-sdb-u-boot.dtsi           |    2 -
 arch/arm/dts/ls1021a-twr.dtsi                 |    5 +-
 arch/arm/dts/ls1021a.dtsi                     |    6 +-
 .../include/asm/arch-fsl-layerscape/config.h  |    1 -
 arch/arm/include/asm/arch-ls102xa/config.h    |    1 -
 configs/ls1012a2g5rdb_qspi_defconfig          |    1 +
 configs/ls1012a2g5rdb_tfa_defconfig           |    1 +
 configs/ls1012afrdm_qspi_defconfig            |    1 +
 configs/ls1012afrdm_tfa_defconfig             |    1 +
 configs/ls1012aqds_qspi_defconfig             |    1 +
 configs/ls1012aqds_tfa_SECURE_BOOT_defconfig  |    1 +
 configs/ls1012aqds_tfa_defconfig              |    1 +
 configs/ls1012ardb_qspi_SECURE_BOOT_defconfig |    1 +
 configs/ls1012ardb_qspi_defconfig             |    1 +
 configs/ls1012ardb_tfa_SECURE_BOOT_defconfig  |    1 +
 configs/ls1012ardb_tfa_defconfig              |    1 +
 configs/ls1043aqds_qspi_defconfig             |    1 +
 configs/ls1043aqds_sdcard_qspi_defconfig      |    1 +
 configs/ls1043aqds_tfa_SECURE_BOOT_defconfig  |    2 +
 configs/ls1043aqds_tfa_defconfig              |    1 +
 configs/ls1046aqds_qspi_defconfig             |    1 +
 configs/ls1046aqds_sdcard_qspi_defconfig      |    1 +
 configs/ls1046aqds_tfa_SECURE_BOOT_defconfig  |    1 +
 configs/ls1046aqds_tfa_defconfig              |    1 +
 configs/ls1046ardb_qspi_SECURE_BOOT_defconfig |    1 +
 configs/ls1046ardb_qspi_defconfig             |    1 +
 configs/ls1046ardb_tfa_SECURE_BOOT_defconfig  |    1 +
 configs/ls1046ardb_tfa_defconfig              |    1 +
 drivers/spi/fsl_qspi.c                        | 1562 +++++++----------
 drivers/spi/fsl_qspi.h                        |  145 --
 include/configs/ls1012a_common.h              |   17 +-
 include/configs/ls1012afrwy.h                 |    3 -
 include/configs/ls1012ardb.h                  |    3 -
 include/configs/ls1021aiot.h                  |    6 -
 include/configs/ls1021aqds.h                  |   11 -
 include/configs/ls1021atwr.h                  |   10 -
 include/configs/ls1043aqds.h                  |   10 -
 include/configs/ls1046afrwy.h                 |    9 -
 include/configs/ls1046aqds.h                  |   19 -
 include/configs/ls1046ardb.h                  |   20 -
 include/configs/ls1088a_common.h              |    6 -
 include/configs/ls1088aqds.h                  |    8 -
 include/configs/ls1088ardb.h                  |   18 -
 include/configs/ls2080aqds.h                  |    2 -
 include/configs/ls2080ardb.h                  |    8 +-
 include/configs/mx6sxsabreauto.h              |    6 -
 include/configs/mx6sxsabresd.h                |   11 -
 include/configs/mx6ul_14x14_evk.h             |    6 -
 include/configs/mx6ullevk.h                   |    6 -
 include/configs/mx7dsabresd.h                 |    8 -
 include/configs/pcm052.h                      |    7 -
 include/configs/vf610twr.h                    |    8 -
 scripts/config_whitelist.txt                  |    5 -
 71 files changed, 655 insertions(+), 1380 deletions(-)
 delete mode 100644 drivers/spi/fsl_qspi.h

-- 
2.17.1

[Patch v2 1/7] spi: Transform the FSL QuadSPI driver to use the SPI MEM API

[Kuldeep Singh]

To support the SPI MEM API, instead of modifying the existing U-Boot
driver, this patch adds a port of the existing Linux driver.
This also has the advantage that porting changes and fixes from Linux
will be easier.
Porting of driver left most of the functions unchanged while few of the
changes are:
-Remove lock(mutexes) and irq handler as uboot is a single core execution.
-Remove clock support as the changing spi speed is not supported in
uboot and nor in linux.

Currently tested on LS1088ARDB, LS1012ARDB, LS1046ARDB, LS1046AFRWY,
LS1043AQDS, LS1021ATWR, LS2080ARDB

Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de>
Signed-off-by: Ashish Kumar <Ashish.Kumar@nxp.com>
Signed-off-by: Kuldeep Singh <kuldeep.singh@nxp.com>
---
 drivers/spi/fsl_qspi.c | 1562 +++++++++++++++-------------------------
 drivers/spi/fsl_qspi.h |  145 ----
 2 files changed, 593 insertions(+), 1114 deletions(-)
 delete mode 100644 drivers/spi/fsl_qspi.h

diff --git a/drivers/spi/fsl_qspi.c b/drivers/spi/fsl_qspi.c
index 8e2a09df36..96178c06bc 100644
--- a/drivers/spi/fsl_qspi.c
+++ b/drivers/spi/fsl_qspi.c
@@ -1,1142 +1,766 @@
 // SPDX-License-Identifier: GPL-2.0+
+
 /*
- * Copyright 2013-2015 Freescale Semiconductor, Inc.
+ * Freescale QuadSPI driver.
+ *
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
+ * Copyright (C) 2018 Bootlin
+ * Copyright (C) 2018 exceet electronics GmbH
+ * Copyright (C) 2018 Kontron Electronics GmbH
+ * Copyright (C) 2019-2020 NXP
  *
- * Freescale Quad Serial Peripheral Interface (QSPI) driver
+ * Based on the original fsl-quadspi.c spi-nor driver.
+ * Transition to spi-mem in spi-fsl-qspi.c
  */
 
 #include <common.h>
-#include <malloc.h>
-#include <spi.h>
 #include <asm/io.h>
-#include <linux/sizes.h>
-#include <linux/iopoll.h>
 #include <dm.h>
-#include <errno.h>
-#include <watchdog.h>
-#include <wait_bit.h>
-#include "fsl_qspi.h"
+#include <linux/iopoll.h>
+#include <linux/sizes.h>
+#include <spi.h>
+#include <spi-mem.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#define OFFSET_BITS_MASK	GENMASK(23, 0)
-
-#define FLASH_STATUS_WEL	0x02
-
-/* SEQID */
-#define SEQID_WREN		1
-#define SEQID_FAST_READ		2
-#define SEQID_RDSR		3
-#define SEQID_SE		4
-#define SEQID_CHIP_ERASE	5
-#define SEQID_PP		6
-#define SEQID_RDID		7
-#define SEQID_BE_4K		8
-#ifdef CONFIG_SPI_FLASH_BAR
-#define SEQID_BRRD		9
-#define SEQID_BRWR		10
-#define SEQID_RDEAR		11
-#define SEQID_WREAR		12
-#endif
-#define SEQID_WRAR		13
-#define SEQID_RDAR		14
-
-/* QSPI CMD */
-#define QSPI_CMD_PP		0x02	/* Page program (up to 256 bytes) */
-#define QSPI_CMD_RDSR		0x05	/* Read status register */
-#define QSPI_CMD_WREN		0x06	/* Write enable */
-#define QSPI_CMD_FAST_READ	0x0b	/* Read data bytes (high frequency) */
-#define QSPI_CMD_BE_4K		0x20    /* 4K erase */
-#define QSPI_CMD_CHIP_ERASE	0xc7	/* Erase whole flash chip */
-#define QSPI_CMD_SE		0xd8	/* Sector erase (usually 64KiB) */
-#define QSPI_CMD_RDID		0x9f	/* Read JEDEC ID */
-
-/* Used for Micron, winbond and Macronix flashes */
-#define	QSPI_CMD_WREAR		0xc5	/* EAR register write */
-#define	QSPI_CMD_RDEAR		0xc8	/* EAR reigster read */
-
-/* Used for Spansion flashes only. */
-#define	QSPI_CMD_BRRD		0x16	/* Bank register read */
-#define	QSPI_CMD_BRWR		0x17	/* Bank register write */
-
-/* Used for Spansion S25FS-S family flash only. */
-#define QSPI_CMD_RDAR		0x65	/* Read any device register */
-#define QSPI_CMD_WRAR		0x71	/* Write any device register */
-
-/* 4-byte address QSPI CMD - used on Spansion and some Macronix flashes */
-#define QSPI_CMD_FAST_READ_4B	0x0c    /* Read data bytes (high frequency) */
-#define QSPI_CMD_PP_4B		0x12    /* Page program (up to 256 bytes) */
-#define QSPI_CMD_SE_4B		0xdc    /* Sector erase (usually 64KiB) */
-
-/* fsl_qspi_platdata flags */
-#define QSPI_FLAG_REGMAP_ENDIAN_BIG	BIT(0)
-
-/* default SCK frequency, unit: HZ */
-#define FSL_QSPI_DEFAULT_SCK_FREQ	50000000
-
-/* QSPI max chipselect signals number */
-#define FSL_QSPI_MAX_CHIPSELECT_NUM     4
-
-/* Controller needs driver to swap endian */
+/*
+ * The driver only uses one single LUT entry, that is updated on
+ * each call of exec_op(). Index 0 is preset at boot with a basic
+ * read operation, so let's use the last entry (15).
+ */
+#define	SEQID_LUT			15
+
+/* Registers used by the driver */
+#define QUADSPI_MCR			0x00
+#define QUADSPI_MCR_RESERVED_MASK	GENMASK(19, 16)
+#define QUADSPI_MCR_MDIS_MASK		BIT(14)
+#define QUADSPI_MCR_CLR_TXF_MASK	BIT(11)
+#define QUADSPI_MCR_CLR_RXF_MASK	BIT(10)
+#define QUADSPI_MCR_DDR_EN_MASK		BIT(7)
+#define QUADSPI_MCR_END_CFG_MASK	GENMASK(3, 2)
+#define QUADSPI_MCR_SWRSTHD_MASK	BIT(1)
+#define QUADSPI_MCR_SWRSTSD_MASK	BIT(0)
+
+#define QUADSPI_IPCR			0x08
+#define QUADSPI_IPCR_SEQID(x)		((x) << 24)
+#define QUADSPI_FLSHCR			0x0c
+#define QUADSPI_FLSHCR_TCSS_MASK	GENMASK(3, 0)
+#define QUADSPI_FLSHCR_TCSH_MASK	GENMASK(11, 8)
+#define QUADSPI_FLSHCR_TDH_MASK		GENMASK(17, 16)
+
+#define QUADSPI_BUF3CR			0x1c
+#define QUADSPI_BUF3CR_ALLMST_MASK	BIT(31)
+#define QUADSPI_BUF3CR_ADATSZ(x)	((x) << 8)
+#define QUADSPI_BUF3CR_ADATSZ_MASK	GENMASK(15, 8)
+
+#define QUADSPI_BFGENCR			0x20
+#define QUADSPI_BFGENCR_SEQID(x)	((x) << 12)
+
+#define QUADSPI_BUF0IND			0x30
+#define QUADSPI_BUF1IND			0x34
+#define QUADSPI_BUF2IND			0x38
+#define QUADSPI_SFAR			0x100
+
+#define QUADSPI_SMPR			0x108
+#define QUADSPI_SMPR_DDRSMP_MASK	GENMASK(18, 16)
+#define QUADSPI_SMPR_FSDLY_MASK		BIT(6)
+#define QUADSPI_SMPR_FSPHS_MASK		BIT(5)
+#define QUADSPI_SMPR_HSENA_MASK		BIT(0)
+
+#define QUADSPI_RBCT			0x110
+#define QUADSPI_RBCT_WMRK_MASK		GENMASK(4, 0)
+#define QUADSPI_RBCT_RXBRD_USEIPS	BIT(8)
+
+#define QUADSPI_TBDR			0x154
+
+#define QUADSPI_SR			0x15c
+#define QUADSPI_SR_IP_ACC_MASK		BIT(1)
+#define QUADSPI_SR_AHB_ACC_MASK		BIT(2)
+
+#define QUADSPI_FR			0x160
+#define QUADSPI_FR_TFF_MASK		BIT(0)
+
+#define QUADSPI_RSER			0x164
+#define QUADSPI_RSER_TFIE		BIT(0)
+
+#define QUADSPI_SPTRCLR			0x16c
+#define QUADSPI_SPTRCLR_IPPTRC		BIT(8)
+#define QUADSPI_SPTRCLR_BFPTRC		BIT(0)
+
+#define QUADSPI_SFA1AD			0x180
+#define QUADSPI_SFA2AD			0x184
+#define QUADSPI_SFB1AD			0x188
+#define QUADSPI_SFB2AD			0x18c
+#define QUADSPI_RBDR(x)			(0x200 + ((x) * 4))
+
+#define QUADSPI_LUTKEY			0x300
+#define QUADSPI_LUTKEY_VALUE		0x5AF05AF0
+
+#define QUADSPI_LCKCR			0x304
+#define QUADSPI_LCKER_LOCK		BIT(0)
+#define QUADSPI_LCKER_UNLOCK		BIT(1)
+
+#define QUADSPI_LUT_BASE		0x310
+#define QUADSPI_LUT_OFFSET		(SEQID_LUT * 4 * 4)
+#define QUADSPI_LUT_REG(idx) \
+	(QUADSPI_LUT_BASE + QUADSPI_LUT_OFFSET + (idx) * 4)
+
+/* Instruction set for the LUT register */
+#define LUT_STOP		0
+#define LUT_CMD			1
+#define LUT_ADDR		2
+#define LUT_DUMMY		3
+#define LUT_MODE		4
+#define LUT_MODE2		5
+#define LUT_MODE4		6
+#define LUT_FSL_READ		7
+#define LUT_FSL_WRITE		8
+#define LUT_JMP_ON_CS		9
+#define LUT_ADDR_DDR		10
+#define LUT_MODE_DDR		11
+#define LUT_MODE2_DDR		12
+#define LUT_MODE4_DDR		13
+#define LUT_FSL_READ_DDR	14
+#define LUT_FSL_WRITE_DDR	15
+#define LUT_DATA_LEARN		16
+
+/*
+ * The PAD definitions for LUT register.
+ *
+ * The pad stands for the number of IO lines [0:3].
+ * For example, the quad read needs four IO lines,
+ * so you should use LUT_PAD(4).
+ */
+#define LUT_PAD(x) (fls(x) - 1)
+
+/*
+ * Macro for constructing the LUT entries with the following
+ * register layout:
+ *
+ *  ---------------------------------------------------
+ *  | INSTR1 | PAD1 | OPRND1 | INSTR0 | PAD0 | OPRND0 |
+ *  ---------------------------------------------------
+ */
+#define LUT_DEF(idx, ins, pad, opr)					\
+	((((ins) << 10) | ((pad) << 8) | (opr)) << (((idx) % 2) * 16))
+
+/* Controller needs driver to swap endianness */
 #define QUADSPI_QUIRK_SWAP_ENDIAN	BIT(0)
 
-enum fsl_qspi_devtype {
-	FSL_QUADSPI_VYBRID,
-	FSL_QUADSPI_IMX6SX,
-	FSL_QUADSPI_IMX6UL_7D,
-	FSL_QUADSPI_IMX7ULP,
-};
+/* Controller needs 4x internal clock */
+#define QUADSPI_QUIRK_4X_INT_CLK	BIT(1)
 
-struct fsl_qspi_devtype_data {
-	enum fsl_qspi_devtype devtype;
-	u32 rxfifo;
-	u32 txfifo;
-	u32 ahb_buf_size;
-	u32 driver_data;
-};
+/*
+ * TKT253890, the controller needs the driver to fill the txfifo with
+ * 16 bytes@least to trigger a data transfer, even though the extra
+ * data won't be transferred.
+ */
+#define QUADSPI_QUIRK_TKT253890		BIT(2)
 
-/**
- * struct fsl_qspi_platdata - platform data for Freescale QSPI
- *
- * @flags: Flags for QSPI QSPI_FLAG_...
- * @speed_hz: Default SCK frequency
- * @reg_base: Base address of QSPI registers
- * @amba_base: Base address of QSPI memory mapping
- * @amba_total_size: size of QSPI memory mapping
- * @flash_num: Number of active slave devices
- * @num_chipselect: Number of QSPI chipselect signals
+/* TKT245618, the controller cannot wake up from wait mode */
+#define QUADSPI_QUIRK_TKT245618		BIT(3)
+
+/*
+ * Controller adds QSPI_AMBA_BASE (base address of the mapped memory)
+ * internally. No need to add it when setting SFXXAD and SFAR registers
  */
-struct fsl_qspi_platdata {
-	u32 flags;
-	u32 speed_hz;
-	fdt_addr_t reg_base;
-	fdt_addr_t amba_base;
-	fdt_size_t amba_total_size;
-	u32 flash_num;
-	u32 num_chipselect;
-};
+#define QUADSPI_QUIRK_BASE_INTERNAL	BIT(4)
 
-/**
- * struct fsl_qspi_priv - private data for Freescale QSPI
- *
- * @flags: Flags for QSPI QSPI_FLAG_...
- * @bus_clk: QSPI input clk frequency
- * @speed_hz: Default SCK frequency
- * @cur_seqid: current LUT table sequence id
- * @sf_addr: flash access offset
- * @amba_base: Base address of QSPI memory mapping of every CS
- * @amba_total_size: size of QSPI memory mapping
- * @cur_amba_base: Base address of QSPI memory mapping of current CS
- * @flash_num: Number of active slave devices
- * @num_chipselect: Number of QSPI chipselect signals
- * @regs: Point to QSPI register structure for I/O access
+/*
+ * Controller uses TDH bits in register QUADSPI_FLSHCR.
+ * They need to be set in accordance with the DDR/SDR mode.
  */
-struct fsl_qspi_priv {
-	u32 flags;
-	u32 bus_clk;
-	u32 speed_hz;
-	u32 cur_seqid;
-	u32 sf_addr;
-	u32 amba_base[FSL_QSPI_MAX_CHIPSELECT_NUM];
-	u32 amba_total_size;
-	u32 cur_amba_base;
-	u32 flash_num;
-	u32 num_chipselect;
-	struct fsl_qspi_regs *regs;
-	struct fsl_qspi_devtype_data *devtype_data;
+#define QUADSPI_QUIRK_USE_TDH_SETTING	BIT(5)
+
+struct fsl_qspi_devtype_data {
+	unsigned int rxfifo;
+	unsigned int txfifo;
+	unsigned int ahb_buf_size;
+	unsigned int quirks;
+	bool little_endian;
 };
 
 static const struct fsl_qspi_devtype_data vybrid_data = {
-	.devtype = FSL_QUADSPI_VYBRID,
-	.rxfifo = 128,
-	.txfifo = 64,
-	.ahb_buf_size = 1024,
-	.driver_data = QUADSPI_QUIRK_SWAP_ENDIAN,
+	.rxfifo = SZ_128,
+	.txfifo = SZ_64,
+	.ahb_buf_size = SZ_1K,
+	.quirks = QUADSPI_QUIRK_SWAP_ENDIAN,
+	.little_endian = true,
 };
 
 static const struct fsl_qspi_devtype_data imx6sx_data = {
-	.devtype = FSL_QUADSPI_IMX6SX,
-	.rxfifo = 128,
-	.txfifo = 512,
-	.ahb_buf_size = 1024,
-	.driver_data = 0,
+	.rxfifo = SZ_128,
+	.txfifo = SZ_512,
+	.ahb_buf_size = SZ_1K,
+	.quirks = QUADSPI_QUIRK_4X_INT_CLK | QUADSPI_QUIRK_TKT245618,
+	.little_endian = true,
+};
+
+static const struct fsl_qspi_devtype_data imx7d_data = {
+	.rxfifo = SZ_128,
+	.txfifo = SZ_512,
+	.ahb_buf_size = SZ_1K,
+	.quirks = QUADSPI_QUIRK_TKT253890 | QUADSPI_QUIRK_4X_INT_CLK |
+		  QUADSPI_QUIRK_USE_TDH_SETTING,
+	.little_endian = true,
+};
+
+static const struct fsl_qspi_devtype_data imx6ul_data = {
+	.rxfifo = SZ_128,
+	.txfifo = SZ_512,
+	.ahb_buf_size = SZ_1K,
+	.quirks = QUADSPI_QUIRK_TKT253890 | QUADSPI_QUIRK_4X_INT_CLK |
+		  QUADSPI_QUIRK_USE_TDH_SETTING,
+	.little_endian = true,
 };
 
-static const struct fsl_qspi_devtype_data imx6ul_7d_data = {
-	.devtype = FSL_QUADSPI_IMX6UL_7D,
-	.rxfifo = 128,
-	.txfifo = 512,
-	.ahb_buf_size = 1024,
-	.driver_data = 0,
+static const struct fsl_qspi_devtype_data ls1021a_data = {
+	.rxfifo = SZ_128,
+	.txfifo = SZ_64,
+	.ahb_buf_size = SZ_1K,
+	.quirks = 0,
+	.little_endian = false,
 };
 
-static const struct fsl_qspi_devtype_data imx7ulp_data = {
-	.devtype = FSL_QUADSPI_IMX7ULP,
-	.rxfifo = 64,
-	.txfifo = 64,
-	.ahb_buf_size = 128,
-	.driver_data = 0,
+static const struct fsl_qspi_devtype_data ls1088a_data = {
+	.rxfifo = SZ_128,
+	.txfifo = SZ_128,
+	.ahb_buf_size = SZ_1K,
+	.quirks = QUADSPI_QUIRK_TKT253890,
+	.little_endian = true,
 };
 
-static u32 qspi_read32(u32 flags, u32 *addr)
+static const struct fsl_qspi_devtype_data ls2080a_data = {
+	.rxfifo = SZ_128,
+	.txfifo = SZ_64,
+	.ahb_buf_size = SZ_1K,
+	.quirks = QUADSPI_QUIRK_TKT253890 | QUADSPI_QUIRK_BASE_INTERNAL,
+	.little_endian = true,
+};
+
+struct fsl_qspi {
+	void __iomem *iobase;
+	void __iomem *ahb_addr;
+	u32 memmap_phy;
+	const struct fsl_qspi_devtype_data *devtype_data;
+	int selected;
+};
+
+static inline int needs_swap_endian(struct fsl_qspi *q)
 {
-	return flags & QSPI_FLAG_REGMAP_ENDIAN_BIG ?
-		in_be32(addr) : in_le32(addr);
+	return q->devtype_data->quirks & QUADSPI_QUIRK_SWAP_ENDIAN;
 }
 
-static void qspi_write32(u32 flags, u32 *addr, u32 val)
+static inline int needs_4x_clock(struct fsl_qspi *q)
 {
-	flags & QSPI_FLAG_REGMAP_ENDIAN_BIG ?
-		out_be32(addr, val) : out_le32(addr, val);
+	return q->devtype_data->quirks & QUADSPI_QUIRK_4X_INT_CLK;
 }
 
-static inline int is_controller_busy(const struct fsl_qspi_priv *priv)
+static inline int needs_fill_txfifo(struct fsl_qspi *q)
 {
-	u32 val;
-	u32 mask = QSPI_SR_BUSY_MASK | QSPI_SR_AHB_ACC_MASK |
-		   QSPI_SR_IP_ACC_MASK;
-
-	if (priv->flags & QSPI_FLAG_REGMAP_ENDIAN_BIG)
-		mask = (u32)cpu_to_be32(mask);
-
-	return readl_poll_timeout(&priv->regs->sr, val, !(val & mask), 1000);
+	return q->devtype_data->quirks & QUADSPI_QUIRK_TKT253890;
 }
 
-/* QSPI support swapping the flash read/write data
- * in hardware for LS102xA, but not for VF610 */
-static inline u32 qspi_endian_xchg(struct fsl_qspi_priv *priv, u32 data)
+static inline int needs_wakeup_wait_mode(struct fsl_qspi *q)
 {
-	if (priv->devtype_data->driver_data & QUADSPI_QUIRK_SWAP_ENDIAN)
-		return swab32(data);
-	else
-		return data;
+	return q->devtype_data->quirks & QUADSPI_QUIRK_TKT245618;
 }
 
-static void qspi_set_lut(struct fsl_qspi_priv *priv)
+static inline int needs_amba_base_offset(struct fsl_qspi *q)
 {
-	struct fsl_qspi_regs *regs = priv->regs;
-	u32 lut_base;
-
-	/* Unlock the LUT */
-	qspi_write32(priv->flags, &regs->lutkey, LUT_KEY_VALUE);
-	qspi_write32(priv->flags, &regs->lckcr, QSPI_LCKCR_UNLOCK);
-
-	/* Write Enable */
-	lut_base = SEQID_WREN * 4;
-	qspi_write32(priv->flags, &regs->lut[lut_base], OPRND0(QSPI_CMD_WREN) |
-		PAD0(LUT_PAD1) | INSTR0(LUT_CMD));
-	qspi_write32(priv->flags, &regs->lut[lut_base + 1], 0);
-	qspi_write32(priv->flags, &regs->lut[lut_base + 2], 0);
-	qspi_write32(priv->flags, &regs->lut[lut_base + 3], 0);
-
-	/* Fast Read */
-	lut_base = SEQID_FAST_READ * 4;
-#ifdef CONFIG_SPI_FLASH_BAR
-	qspi_write32(priv->flags, &regs->lut[lut_base],
-		     OPRND0(QSPI_CMD_FAST_READ) | PAD0(LUT_PAD1) |
-		     INSTR0(LUT_CMD) | OPRND1(ADDR24BIT) |
-		     PAD1(LUT_PAD1) | INSTR1(LUT_ADDR));
-#else
-	if (FSL_QSPI_FLASH_SIZE  <= SZ_16M)
-		qspi_write32(priv->flags, &regs->lut[lut_base],
-			     OPRND0(QSPI_CMD_FAST_READ) | PAD0(LUT_PAD1) |
-			     INSTR0(LUT_CMD) | OPRND1(ADDR24BIT) |
-			     PAD1(LUT_PAD1) | INSTR1(LUT_ADDR));
-	else
-		qspi_write32(priv->flags, &regs->lut[lut_base],
-			     OPRND0(QSPI_CMD_FAST_READ_4B) |
-			     PAD0(LUT_PAD1) | INSTR0(LUT_CMD) |
-			     OPRND1(ADDR32BIT) | PAD1(LUT_PAD1) |
-			     INSTR1(LUT_ADDR));
-#endif
-	qspi_write32(priv->flags, &regs->lut[lut_base + 1],
-		     OPRND0(8) | PAD0(LUT_PAD1) | INSTR0(LUT_DUMMY) |
-		     OPRND1(priv->devtype_data->rxfifo) | PAD1(LUT_PAD1) |
-		     INSTR1(LUT_READ));
-	qspi_write32(priv->flags, &regs->lut[lut_base + 2], 0);
-	qspi_write32(priv->flags, &regs->lut[lut_base + 3], 0);
-
-	/* Read Status */
-	lut_base = SEQID_RDSR * 4;
-	qspi_write32(priv->flags, &regs->lut[lut_base], OPRND0(QSPI_CMD_RDSR) |
-		PAD0(LUT_PAD1) | INSTR0(LUT_CMD) | OPRND1(1) |
-		PAD1(LUT_PAD1) | INSTR1(LUT_READ));
-	qspi_write32(priv->flags, &regs->lut[lut_base + 1], 0);
-	qspi_write32(priv->flags, &regs->lut[lut_base + 2], 0);
-	qspi_write32(priv->flags, &regs->lut[lut_base + 3], 0);
-
-	/* Erase a sector */
-	lut_base = SEQID_SE * 4;
-#ifdef CONFIG_SPI_FLASH_BAR
-	qspi_write32(priv->flags, &regs->lut[lut_base], OPRND0(QSPI_CMD_SE) |
-		     PAD0(LUT_PAD1) | INSTR0(LUT_CMD) | OPRND1(ADDR24BIT) |
-		     PAD1(LUT_PAD1) | INSTR1(LUT_ADDR));
-#else
-	if (FSL_QSPI_FLASH_SIZE  <= SZ_16M)
-		qspi_write32(priv->flags, &regs->lut[lut_base],
-			     OPRND0(QSPI_CMD_SE) | PAD0(LUT_PAD1) |
-			     INSTR0(LUT_CMD) | OPRND1(ADDR24BIT) |
-			     PAD1(LUT_PAD1) | INSTR1(LUT_ADDR));
-	else
-		qspi_write32(priv->flags, &regs->lut[lut_base],
-			     OPRND0(QSPI_CMD_SE_4B) | PAD0(LUT_PAD1) |
-			     INSTR0(LUT_CMD) | OPRND1(ADDR32BIT) |
-			     PAD1(LUT_PAD1) | INSTR1(LUT_ADDR));
-#endif
-	qspi_write32(priv->flags, &regs->lut[lut_base + 1], 0);
-	qspi_write32(priv->flags, &regs->lut[lut_base + 2], 0);
-	qspi_write32(priv->flags, &regs->lut[lut_base + 3], 0);
-
-	/* Erase the whole chip */
-	lut_base = SEQID_CHIP_ERASE * 4;
-	qspi_write32(priv->flags, &regs->lut[lut_base],
-		     OPRND0(QSPI_CMD_CHIP_ERASE) |
-		     PAD0(LUT_PAD1) | INSTR0(LUT_CMD));
-	qspi_write32(priv->flags, &regs->lut[lut_base + 1], 0);
-	qspi_write32(priv->flags, &regs->lut[lut_base + 2], 0);
-	qspi_write32(priv->flags, &regs->lut[lut_base + 3], 0);
-
-	/* Page Program */
-	lut_base = SEQID_PP * 4;
-#ifdef CONFIG_SPI_FLASH_BAR
-	qspi_write32(priv->flags, &regs->lut[lut_base], OPRND0(QSPI_CMD_PP) |
-		     PAD0(LUT_PAD1) | INSTR0(LUT_CMD) | OPRND1(ADDR24BIT) |
-		     PAD1(LUT_PAD1) | INSTR1(LUT_ADDR));
-#else
-	if (FSL_QSPI_FLASH_SIZE  <= SZ_16M)
-		qspi_write32(priv->flags, &regs->lut[lut_base],
-			     OPRND0(QSPI_CMD_PP) | PAD0(LUT_PAD1) |
-			     INSTR0(LUT_CMD) | OPRND1(ADDR24BIT) |
-			     PAD1(LUT_PAD1) | INSTR1(LUT_ADDR));
-	else
-		qspi_write32(priv->flags, &regs->lut[lut_base],
-			     OPRND0(QSPI_CMD_PP_4B) | PAD0(LUT_PAD1) |
-			     INSTR0(LUT_CMD) | OPRND1(ADDR32BIT) |
-			     PAD1(LUT_PAD1) | INSTR1(LUT_ADDR));
-#endif
-	/* Use IDATSZ in IPCR to determine the size and here set 0. */
-	qspi_write32(priv->flags, &regs->lut[lut_base + 1], OPRND0(0) |
-		     PAD0(LUT_PAD1) | INSTR0(LUT_WRITE));
-	qspi_write32(priv->flags, &regs->lut[lut_base + 2], 0);
-	qspi_write32(priv->flags, &regs->lut[lut_base + 3], 0);
-
-	/* READ ID */
-	lut_base = SEQID_RDID * 4;
-	qspi_write32(priv->flags, &regs->lut[lut_base], OPRND0(QSPI_CMD_RDID) |
-		PAD0(LUT_PAD1) | INSTR0(LUT_CMD) | OPRND1(8) |
-		PAD1(LUT_PAD1) | INSTR1(LUT_READ));
-	qspi_write32(priv->flags, &regs->lut[lut_base + 1], 0);
-	qspi_write32(priv->flags, &regs->lut[lut_base + 2], 0);
-	qspi_write32(priv->flags, &regs->lut[lut_base + 3], 0);
-
-	/* SUB SECTOR 4K ERASE */
-	lut_base = SEQID_BE_4K * 4;
-	qspi_write32(priv->flags, &regs->lut[lut_base], OPRND0(QSPI_CMD_BE_4K) |
-		     PAD0(LUT_PAD1) | INSTR0(LUT_CMD) | OPRND1(ADDR24BIT) |
-		     PAD1(LUT_PAD1) | INSTR1(LUT_ADDR));
-
-#ifdef CONFIG_SPI_FLASH_BAR
-	/*
-	 * BRRD BRWR RDEAR WREAR are all supported, because it is hard to
-	 * dynamically check whether to set BRRD BRWR or RDEAR WREAR during
-	 * initialization.
-	 */
-	lut_base = SEQID_BRRD * 4;
-	qspi_write32(priv->flags, &regs->lut[lut_base], OPRND0(QSPI_CMD_BRRD) |
-		     PAD0(LUT_PAD1) | INSTR0(LUT_CMD) | OPRND1(1) |
-		     PAD1(LUT_PAD1) | INSTR1(LUT_READ));
-
-	lut_base = SEQID_BRWR * 4;
-	qspi_write32(priv->flags, &regs->lut[lut_base], OPRND0(QSPI_CMD_BRWR) |
-		     PAD0(LUT_PAD1) | INSTR0(LUT_CMD) | OPRND1(1) |
-		     PAD1(LUT_PAD1) | INSTR1(LUT_WRITE));
-
-	lut_base = SEQID_RDEAR * 4;
-	qspi_write32(priv->flags, &regs->lut[lut_base], OPRND0(QSPI_CMD_RDEAR) |
-		     PAD0(LUT_PAD1) | INSTR0(LUT_CMD) | OPRND1(1) |
-		     PAD1(LUT_PAD1) | INSTR1(LUT_READ));
-
-	lut_base = SEQID_WREAR * 4;
-	qspi_write32(priv->flags, &regs->lut[lut_base], OPRND0(QSPI_CMD_WREAR) |
-		     PAD0(LUT_PAD1) | INSTR0(LUT_CMD) | OPRND1(1) |
-		     PAD1(LUT_PAD1) | INSTR1(LUT_WRITE));
-#endif
-
-	/*
-	 * Read any device register.
-	 * Used for Spansion S25FS-S family flash only.
-	 */
-	lut_base = SEQID_RDAR * 4;
-	qspi_write32(priv->flags, &regs->lut[lut_base],
-		     OPRND0(QSPI_CMD_RDAR) | PAD0(LUT_PAD1) |
-		     INSTR0(LUT_CMD) | OPRND1(ADDR24BIT) |
-		     PAD1(LUT_PAD1) | INSTR1(LUT_ADDR));
-	qspi_write32(priv->flags, &regs->lut[lut_base + 1],
-		     OPRND0(8) | PAD0(LUT_PAD1) | INSTR0(LUT_DUMMY) |
-		     OPRND1(1) | PAD1(LUT_PAD1) |
-		     INSTR1(LUT_READ));
+	return !(q->devtype_data->quirks & QUADSPI_QUIRK_BASE_INTERNAL);
+}
 
-	/*
-	 * Write any device register.
-	 * Used for Spansion S25FS-S family flash only.
-	 */
-	lut_base = SEQID_WRAR * 4;
-	qspi_write32(priv->flags, &regs->lut[lut_base],
-		     OPRND0(QSPI_CMD_WRAR) | PAD0(LUT_PAD1) |
-		     INSTR0(LUT_CMD) | OPRND1(ADDR24BIT) |
-		     PAD1(LUT_PAD1) | INSTR1(LUT_ADDR));
-	qspi_write32(priv->flags, &regs->lut[lut_base + 1],
-		     OPRND0(1) | PAD0(LUT_PAD1) | INSTR0(LUT_WRITE));
-
-	/* Lock the LUT */
-	qspi_write32(priv->flags, &regs->lutkey, LUT_KEY_VALUE);
-	qspi_write32(priv->flags, &regs->lckcr, QSPI_LCKCR_LOCK);
+static inline int needs_tdh_setting(struct fsl_qspi *q)
+{
+	return q->devtype_data->quirks & QUADSPI_QUIRK_USE_TDH_SETTING;
 }
 
-#if defined(CONFIG_SYS_FSL_QSPI_AHB)
 /*
- * If we have changed the content of the flash by writing or erasing,
- * we need to invalidate the AHB buffer. If we do not do so, we may read out
- * the wrong data. The spec tells us reset the AHB domain and Serial Flash
- * domain at the same time.
+ * An IC bug makes it necessary to rearrange the 32-bit data.
+ * Later chips, such as IMX6SLX, have fixed this bug.
  */
-static inline void qspi_ahb_invalid(struct fsl_qspi_priv *priv)
+static inline u32 fsl_qspi_endian_xchg(struct fsl_qspi *q, u32 a)
 {
-	struct fsl_qspi_regs *regs = priv->regs;
-	u32 reg;
-
-	reg = qspi_read32(priv->flags, &regs->mcr);
-	reg |= QSPI_MCR_SWRSTHD_MASK | QSPI_MCR_SWRSTSD_MASK;
-	qspi_write32(priv->flags, &regs->mcr, reg);
-
-	/*
-	 * The minimum delay : 1 AHB + 2 SFCK clocks.
-	 * Delay 1 us is enough.
-	 */
-	udelay(1);
-
-	reg &= ~(QSPI_MCR_SWRSTHD_MASK | QSPI_MCR_SWRSTSD_MASK);
-	qspi_write32(priv->flags, &regs->mcr, reg);
+	return needs_swap_endian(q) ? __swab32(a) : a;
 }
 
-/* Read out the data from the AHB buffer. */
-static inline void qspi_ahb_read(struct fsl_qspi_priv *priv, u8 *rxbuf, int len)
+/*
+ * R/W functions for big- or little-endian registers:
+ * The QSPI controller's endianness is independent of
+ * the CPU core's endianness. So far, although the CPU
+ * core is little-endian the QSPI controller can use
+ * big-endian or little-endian.
+ */
+static void qspi_writel(struct fsl_qspi *q, u32 val, void __iomem *addr)
 {
-	struct fsl_qspi_regs *regs = priv->regs;
-	u32 mcr_reg;
-	void *rx_addr;
-
-	mcr_reg = qspi_read32(priv->flags, &regs->mcr);
-
-	qspi_write32(priv->flags, &regs->mcr,
-		     QSPI_MCR_CLR_RXF_MASK | QSPI_MCR_CLR_TXF_MASK |
-		     mcr_reg);
+	if (q->devtype_data->little_endian)
+		out_le32(addr, val);
+	else
+		out_be32(addr, val);
+}
 
-	rx_addr = (void *)(uintptr_t)(priv->cur_amba_base + priv->sf_addr);
-	/* Read out the data directly from the AHB buffer. */
-	memcpy(rxbuf, rx_addr, len);
+static u32 qspi_readl(struct fsl_qspi *q, void __iomem *addr)
+{
+	if (q->devtype_data->little_endian)
+		return in_le32(addr);
 
-	qspi_write32(priv->flags, &regs->mcr, mcr_reg);
+	return in_be32(addr);
 }
 
-static void qspi_enable_ddr_mode(struct fsl_qspi_priv *priv)
+static int fsl_qspi_check_buswidth(struct fsl_qspi *q, u8 width)
 {
-	u32 reg, reg2;
-	struct fsl_qspi_regs *regs = priv->regs;
+	switch (width) {
+	case 1:
+	case 2:
+	case 4:
+		return 0;
+	}
 
-	reg = qspi_read32(priv->flags, &regs->mcr);
-	/* Disable the module */
-	qspi_write32(priv->flags, &regs->mcr, reg | QSPI_MCR_MDIS_MASK);
-
-	/* Set the Sampling Register for DDR */
-	reg2 = qspi_read32(priv->flags, &regs->smpr);
-	reg2 &= ~QSPI_SMPR_DDRSMP_MASK;
-	reg2 |= (2 << QSPI_SMPR_DDRSMP_SHIFT);
-	qspi_write32(priv->flags, &regs->smpr, reg2);
-
-	/* Enable the module again (enable the DDR too) */
-	reg |= QSPI_MCR_DDR_EN_MASK;
-	/* Enable bit 29 for imx6sx */
-	reg |= BIT(29);
-	qspi_write32(priv->flags, &regs->mcr, reg);
-
-	/* Enable the TDH to 1 for some platforms like imx6ul, imx7d, etc
-	 * These two bits are reserved on other platforms
-	 */
-	reg = qspi_read32(priv->flags, &regs->flshcr);
-	reg &= ~(BIT(17));
-	reg |= BIT(16);
-	qspi_write32(priv->flags, &regs->flshcr, reg);
+	return -ENOTSUPP;
 }
 
-/*
- * There are two different ways to read out the data from the flash:
- *  the "IP Command Read" and the "AHB Command Read".
- *
- * The IC guy suggests we use the "AHB Command Read" which is faster
- * then the "IP Command Read". (What's more is that there is a bug in
- * the "IP Command Read" in the Vybrid.)
- *
- * After we set up the registers for the "AHB Command Read", we can use
- * the memcpy to read the data directly. A "missed" access to the buffer
- * causes the controller to clear the buffer, and use the sequence pointed
- * by the QUADSPI_BFGENCR[SEQID] to initiate a read from the flash.
- */
-static void qspi_init_ahb_read(struct fsl_qspi_priv *priv)
+static bool fsl_qspi_supports_op(struct spi_slave *slave,
+				 const struct spi_mem_op *op)
 {
-	struct fsl_qspi_regs *regs = priv->regs;
+	struct fsl_qspi *q = dev_get_priv(slave->dev->parent);
+	int ret;
+
+	ret = fsl_qspi_check_buswidth(q, op->cmd.buswidth);
 
-	/* AHB configuration for access buffer 0/1/2 .*/
-	qspi_write32(priv->flags, &regs->buf0cr, QSPI_BUFXCR_INVALID_MSTRID);
-	qspi_write32(priv->flags, &regs->buf1cr, QSPI_BUFXCR_INVALID_MSTRID);
-	qspi_write32(priv->flags, &regs->buf2cr, QSPI_BUFXCR_INVALID_MSTRID);
-	qspi_write32(priv->flags, &regs->buf3cr, QSPI_BUF3CR_ALLMST_MASK |
-		     ((priv->devtype_data->ahb_buf_size >> 3) << QSPI_BUF3CR_ADATSZ_SHIFT));
+	if (op->addr.nbytes)
+		ret |= fsl_qspi_check_buswidth(q, op->addr.buswidth);
 
-	/* We only use the buffer3 */
-	qspi_write32(priv->flags, &regs->buf0ind, 0);
-	qspi_write32(priv->flags, &regs->buf1ind, 0);
-	qspi_write32(priv->flags, &regs->buf2ind, 0);
+	if (op->dummy.nbytes)
+		ret |= fsl_qspi_check_buswidth(q, op->dummy.buswidth);
+
+	if (op->data.nbytes)
+		ret |= fsl_qspi_check_buswidth(q, op->data.buswidth);
+
+	if (ret)
+		return false;
 
 	/*
-	 * Set the default lut sequence for AHB Read.
-	 * Parallel mode is disabled.
+	 * The number of instructions needed for the op, needs
+	 * to fit into a single LUT entry.
 	 */
-	qspi_write32(priv->flags, &regs->bfgencr,
-		     SEQID_FAST_READ << QSPI_BFGENCR_SEQID_SHIFT);
-
-	/*Enable DDR Mode*/
-	qspi_enable_ddr_mode(priv);
+	if (op->addr.nbytes +
+	   (op->dummy.nbytes ? 1 : 0) +
+	   (op->data.nbytes ? 1 : 0) > 6)
+		return false;
+
+	/* Max 64 dummy clock cycles supported */
+	if (op->dummy.nbytes &&
+	    (op->dummy.nbytes * 8 / op->dummy.buswidth > 64))
+		return false;
+
+	/* Max data length, check controller limits and alignment */
+	if (op->data.dir == SPI_MEM_DATA_IN &&
+	    (op->data.nbytes > q->devtype_data->ahb_buf_size ||
+	     (op->data.nbytes > q->devtype_data->rxfifo - 4 &&
+	      !IS_ALIGNED(op->data.nbytes, 8))))
+		return false;
+
+	if (op->data.dir == SPI_MEM_DATA_OUT &&
+	    op->data.nbytes > q->devtype_data->txfifo)
+		return false;
+
+	return true;
 }
-#endif
 
-#ifdef CONFIG_SPI_FLASH_BAR
-/* Bank register read/write, EAR register read/write */
-static void qspi_op_rdbank(struct fsl_qspi_priv *priv, u8 *rxbuf, u32 len)
+static void fsl_qspi_prepare_lut(struct fsl_qspi *q,
+				 const struct spi_mem_op *op)
 {
-	struct fsl_qspi_regs *regs = priv->regs;
-	u32 reg, mcr_reg, data, seqid;
+	void __iomem *base = q->iobase;
+	u32 lutval[4] = {};
+	int lutidx = 1, i;
 
-	mcr_reg = qspi_read32(priv->flags, &regs->mcr);
-	qspi_write32(priv->flags, &regs->mcr,
-		     QSPI_MCR_CLR_RXF_MASK | QSPI_MCR_CLR_TXF_MASK |
-		     mcr_reg);
-	qspi_write32(priv->flags, &regs->rbct, QSPI_RBCT_RXBRD_USEIPS);
+	lutval[0] |= LUT_DEF(0, LUT_CMD, LUT_PAD(op->cmd.buswidth),
+			     op->cmd.opcode);
 
-	qspi_write32(priv->flags, &regs->sfar, priv->cur_amba_base);
+	/*
+	 * For some unknown reason, using LUT_ADDR doesn't work in some
+	 * cases (at least with only one byte long addresses), so
+	 * let's use LUT_MODE to write the address bytes one by one
+	 */
+	for (i = 0; i < op->addr.nbytes; i++) {
+		u8 addrbyte = op->addr.val >> (8 * (op->addr.nbytes - i - 1));
 
-	if (priv->cur_seqid == QSPI_CMD_BRRD)
-		seqid = SEQID_BRRD;
-	else
-		seqid = SEQID_RDEAR;
-
-	qspi_write32(priv->flags, &regs->ipcr,
-		     (seqid << QSPI_IPCR_SEQID_SHIFT) | len);
-
-	/* Wait previous command complete */
-	while (qspi_read32(priv->flags, &regs->sr) & QSPI_SR_BUSY_MASK)
-		;
-
-	while (1) {
-		WATCHDOG_RESET();
-
-		reg = qspi_read32(priv->flags, &regs->rbsr);
-		if (reg & QSPI_RBSR_RDBFL_MASK) {
-			data = qspi_read32(priv->flags, &regs->rbdr[0]);
-			data = qspi_endian_xchg(priv, data);
-			memcpy(rxbuf, &data, len);
-			qspi_write32(priv->flags, &regs->mcr,
-				     qspi_read32(priv->flags, &regs->mcr) |
-				     QSPI_MCR_CLR_RXF_MASK);
-			break;
-		}
+		lutval[lutidx / 2] |= LUT_DEF(lutidx, LUT_MODE,
+					      LUT_PAD(op->addr.buswidth),
+					      addrbyte);
+		lutidx++;
 	}
 
-	qspi_write32(priv->flags, &regs->mcr, mcr_reg);
-}
-#endif
-
-static void qspi_op_rdid(struct fsl_qspi_priv *priv, u32 *rxbuf, u32 len)
-{
-	struct fsl_qspi_regs *regs = priv->regs;
-	u32 mcr_reg, rbsr_reg, data, size;
-	int i;
-
-	mcr_reg = qspi_read32(priv->flags, &regs->mcr);
-	qspi_write32(priv->flags, &regs->mcr,
-		     QSPI_MCR_CLR_RXF_MASK | QSPI_MCR_CLR_TXF_MASK |
-		     mcr_reg);
-	qspi_write32(priv->flags, &regs->rbct, QSPI_RBCT_RXBRD_USEIPS);
-
-	qspi_write32(priv->flags, &regs->sfar, priv->cur_amba_base);
-
-	qspi_write32(priv->flags, &regs->ipcr,
-		     (SEQID_RDID << QSPI_IPCR_SEQID_SHIFT) | 0);
-	while (qspi_read32(priv->flags, &regs->sr) & QSPI_SR_BUSY_MASK)
-		;
-
-	i = 0;
-	while ((priv->devtype_data->rxfifo >= len) && (len > 0)) {
-		WATCHDOG_RESET();
-
-		rbsr_reg = qspi_read32(priv->flags, &regs->rbsr);
-		if (rbsr_reg & QSPI_RBSR_RDBFL_MASK) {
-			data = qspi_read32(priv->flags, &regs->rbdr[i]);
-			data = qspi_endian_xchg(priv, data);
-			size = (len < 4) ? len : 4;
-			memcpy(rxbuf, &data, size);
-			len -= size;
-			rxbuf++;
-			i++;
-		}
+	if (op->dummy.nbytes) {
+		lutval[lutidx / 2] |= LUT_DEF(lutidx, LUT_DUMMY,
+					      LUT_PAD(op->dummy.buswidth),
+					      op->dummy.nbytes * 8 /
+					      op->dummy.buswidth);
+		lutidx++;
 	}
 
-	qspi_write32(priv->flags, &regs->mcr, mcr_reg);
-}
-
-/* If not use AHB read, read data from ip interface */
-static void qspi_op_read(struct fsl_qspi_priv *priv, u32 *rxbuf, u32 len)
-{
-	struct fsl_qspi_regs *regs = priv->regs;
-	u32 mcr_reg, data;
-	int i, size;
-	u32 to_or_from;
-	u32 seqid;
-
-	if (priv->cur_seqid == QSPI_CMD_RDAR)
-		seqid = SEQID_RDAR;
-	else
-		seqid = SEQID_FAST_READ;
-
-	mcr_reg = qspi_read32(priv->flags, &regs->mcr);
-	qspi_write32(priv->flags, &regs->mcr,
-		     QSPI_MCR_CLR_RXF_MASK | QSPI_MCR_CLR_TXF_MASK |
-		     mcr_reg);
-	qspi_write32(priv->flags, &regs->rbct, QSPI_RBCT_RXBRD_USEIPS);
-
-	to_or_from = priv->sf_addr + priv->cur_amba_base;
-
-	while (len > 0) {
-		WATCHDOG_RESET();
-
-		qspi_write32(priv->flags, &regs->sfar, to_or_from);
-
-		size = (len > priv->devtype_data->rxfifo) ?
-			priv->devtype_data->rxfifo : len;
-
-		qspi_write32(priv->flags, &regs->ipcr,
-			     (seqid << QSPI_IPCR_SEQID_SHIFT) |
-			     size);
-		while (qspi_read32(priv->flags, &regs->sr) & QSPI_SR_BUSY_MASK)
-			;
-
-		to_or_from += size;
-		len -= size;
-
-		i = 0;
-		while ((priv->devtype_data->rxfifo >= size) && (size > 0)) {
-			data = qspi_read32(priv->flags, &regs->rbdr[i]);
-			data = qspi_endian_xchg(priv, data);
-			if (size < 4)
-				memcpy(rxbuf, &data, size);
-			else
-				memcpy(rxbuf, &data, 4);
-			rxbuf++;
-			size -= 4;
-			i++;
-		}
-		qspi_write32(priv->flags, &regs->mcr,
-			     qspi_read32(priv->flags, &regs->mcr) |
-			     QSPI_MCR_CLR_RXF_MASK);
+	if (op->data.nbytes) {
+		lutval[lutidx / 2] |= LUT_DEF(lutidx,
+					      op->data.dir == SPI_MEM_DATA_IN ?
+					      LUT_FSL_READ : LUT_FSL_WRITE,
+					      LUT_PAD(op->data.buswidth),
+					      0);
+		lutidx++;
 	}
 
-	qspi_write32(priv->flags, &regs->mcr, mcr_reg);
-}
+	lutval[lutidx / 2] |= LUT_DEF(lutidx, LUT_STOP, 0, 0);
 
-static void qspi_op_write(struct fsl_qspi_priv *priv, u8 *txbuf, u32 len)
-{
-	struct fsl_qspi_regs *regs = priv->regs;
-	u32 mcr_reg, data, reg, status_reg, seqid;
-	int i, size, tx_size;
-	u32 to_or_from = 0;
-
-	mcr_reg = qspi_read32(priv->flags, &regs->mcr);
-	qspi_write32(priv->flags, &regs->mcr,
-		     QSPI_MCR_CLR_RXF_MASK | QSPI_MCR_CLR_TXF_MASK |
-		     mcr_reg);
-	qspi_write32(priv->flags, &regs->rbct, QSPI_RBCT_RXBRD_USEIPS);
-
-	status_reg = 0;
-	while ((status_reg & FLASH_STATUS_WEL) != FLASH_STATUS_WEL) {
-		WATCHDOG_RESET();
-
-		qspi_write32(priv->flags, &regs->ipcr,
-			     (SEQID_WREN << QSPI_IPCR_SEQID_SHIFT) | 0);
-		while (qspi_read32(priv->flags, &regs->sr) & QSPI_SR_BUSY_MASK)
-			;
-
-		qspi_write32(priv->flags, &regs->ipcr,
-			     (SEQID_RDSR << QSPI_IPCR_SEQID_SHIFT) | 1);
-		while (qspi_read32(priv->flags, &regs->sr) & QSPI_SR_BUSY_MASK)
-			;
-
-		reg = qspi_read32(priv->flags, &regs->rbsr);
-		if (reg & QSPI_RBSR_RDBFL_MASK) {
-			status_reg = qspi_read32(priv->flags, &regs->rbdr[0]);
-			status_reg = qspi_endian_xchg(priv, status_reg);
-		}
-		qspi_write32(priv->flags, &regs->mcr,
-			     qspi_read32(priv->flags, &regs->mcr) |
-			     QSPI_MCR_CLR_RXF_MASK);
-	}
+	/* unlock LUT */
+	qspi_writel(q, QUADSPI_LUTKEY_VALUE, q->iobase + QUADSPI_LUTKEY);
+	qspi_writel(q, QUADSPI_LCKER_UNLOCK, q->iobase + QUADSPI_LCKCR);
+
+	dev_dbg(q->dev, "CMD[%x] lutval[0:%x \t 1:%x \t 2:%x \t 3:%x]\n",
+		op->cmd.opcode, lutval[0], lutval[1], lutval[2], lutval[3]);
 
-	/* Default is page programming */
-	seqid = SEQID_PP;
-	if (priv->cur_seqid == QSPI_CMD_WRAR)
-		seqid = SEQID_WRAR;
-#ifdef CONFIG_SPI_FLASH_BAR
-	if (priv->cur_seqid == QSPI_CMD_BRWR)
-		seqid = SEQID_BRWR;
-	else if (priv->cur_seqid == QSPI_CMD_WREAR)
-		seqid = SEQID_WREAR;
-#endif
+	/* fill LUT */
+	for (i = 0; i < ARRAY_SIZE(lutval); i++)
+		qspi_writel(q, lutval[i], base + QUADSPI_LUT_REG(i));
 
-	to_or_from = priv->sf_addr + priv->cur_amba_base;
+	/* lock LUT */
+	qspi_writel(q, QUADSPI_LUTKEY_VALUE, q->iobase + QUADSPI_LUTKEY);
+	qspi_writel(q, QUADSPI_LCKER_LOCK, q->iobase + QUADSPI_LCKCR);
+}
 
-	qspi_write32(priv->flags, &regs->sfar, to_or_from);
+/*
+ * If we have changed the content of the flash by writing or erasing, or if we
+ * read from flash with a different offset into the page buffer, we need to
+ * invalidate the AHB buffer. If we do not do so, we may read out the wrong
+ * data. The spec tells us reset the AHB domain and Serial Flash domain at
+ * the same time.
+ */
+static void fsl_qspi_invalidate(struct fsl_qspi *q)
+{
+	u32 reg;
 
-	tx_size = (len > priv->devtype_data->txfifo) ?
-		priv->devtype_data->txfifo : len;
+	reg = qspi_readl(q, q->iobase + QUADSPI_MCR);
+	reg |= QUADSPI_MCR_SWRSTHD_MASK | QUADSPI_MCR_SWRSTSD_MASK;
+	qspi_writel(q, reg, q->iobase + QUADSPI_MCR);
 
-	size = tx_size / 16;
 	/*
-	 * There must be atleast 128bit data
-	 * available in TX FIFO for any pop operation
+	 * The minimum delay : 1 AHB + 2 SFCK clocks.
+	 * Delay 1 us is enough.
 	 */
-	if (tx_size % 16)
-		size++;
-	for (i = 0; i < size * 4; i++) {
-		memcpy(&data, txbuf, 4);
-		data = qspi_endian_xchg(priv, data);
-		qspi_write32(priv->flags, &regs->tbdr, data);
-		txbuf += 4;
-	}
-
-	qspi_write32(priv->flags, &regs->ipcr,
-		     (seqid << QSPI_IPCR_SEQID_SHIFT) | tx_size);
-	while (qspi_read32(priv->flags, &regs->sr) & QSPI_SR_BUSY_MASK)
-		;
+	udelay(1);
 
-	qspi_write32(priv->flags, &regs->mcr, mcr_reg);
+	reg &= ~(QUADSPI_MCR_SWRSTHD_MASK | QUADSPI_MCR_SWRSTSD_MASK);
+	qspi_writel(q, reg, q->iobase + QUADSPI_MCR);
 }
 
-static void qspi_op_rdsr(struct fsl_qspi_priv *priv, void *rxbuf, u32 len)
+static void fsl_qspi_select_mem(struct fsl_qspi *q, struct spi_slave *slave)
 {
-	struct fsl_qspi_regs *regs = priv->regs;
-	u32 mcr_reg, reg, data;
-
-	mcr_reg = qspi_read32(priv->flags, &regs->mcr);
-	qspi_write32(priv->flags, &regs->mcr,
-		     QSPI_MCR_CLR_RXF_MASK | QSPI_MCR_CLR_TXF_MASK |
-		     mcr_reg);
-	qspi_write32(priv->flags, &regs->rbct, QSPI_RBCT_RXBRD_USEIPS);
-
-	qspi_write32(priv->flags, &regs->sfar, priv->cur_amba_base);
-
-	qspi_write32(priv->flags, &regs->ipcr,
-		     (SEQID_RDSR << QSPI_IPCR_SEQID_SHIFT) | 0);
-	while (qspi_read32(priv->flags, &regs->sr) & QSPI_SR_BUSY_MASK)
-		;
-
-	while (1) {
-		WATCHDOG_RESET();
-
-		reg = qspi_read32(priv->flags, &regs->rbsr);
-		if (reg & QSPI_RBSR_RDBFL_MASK) {
-			data = qspi_read32(priv->flags, &regs->rbdr[0]);
-			data = qspi_endian_xchg(priv, data);
-			memcpy(rxbuf, &data, len);
-			qspi_write32(priv->flags, &regs->mcr,
-				     qspi_read32(priv->flags, &regs->mcr) |
-				     QSPI_MCR_CLR_RXF_MASK);
-			break;
-		}
-	}
+	struct dm_spi_slave_platdata *plat =
+		dev_get_parent_platdata(slave->dev);
+
+	if (q->selected == plat->cs)
+		return;
 
-	qspi_write32(priv->flags, &regs->mcr, mcr_reg);
+	q->selected = plat->cs;
+	fsl_qspi_invalidate(q);
 }
 
-static void qspi_op_erase(struct fsl_qspi_priv *priv)
+static void fsl_qspi_read_ahb(struct fsl_qspi *q, const struct spi_mem_op *op)
 {
-	struct fsl_qspi_regs *regs = priv->regs;
-	u32 mcr_reg;
-	u32 to_or_from = 0;
-
-	mcr_reg = qspi_read32(priv->flags, &regs->mcr);
-	qspi_write32(priv->flags, &regs->mcr,
-		     QSPI_MCR_CLR_RXF_MASK | QSPI_MCR_CLR_TXF_MASK |
-		     mcr_reg);
-	qspi_write32(priv->flags, &regs->rbct, QSPI_RBCT_RXBRD_USEIPS);
-
-	to_or_from = priv->sf_addr + priv->cur_amba_base;
-	qspi_write32(priv->flags, &regs->sfar, to_or_from);
-
-	qspi_write32(priv->flags, &regs->ipcr,
-		     (SEQID_WREN << QSPI_IPCR_SEQID_SHIFT) | 0);
-	while (qspi_read32(priv->flags, &regs->sr) & QSPI_SR_BUSY_MASK)
-		;
-
-	if (priv->cur_seqid == QSPI_CMD_SE) {
-		qspi_write32(priv->flags, &regs->ipcr,
-			     (SEQID_SE << QSPI_IPCR_SEQID_SHIFT) | 0);
-	} else if (priv->cur_seqid == QSPI_CMD_BE_4K) {
-		qspi_write32(priv->flags, &regs->ipcr,
-			     (SEQID_BE_4K << QSPI_IPCR_SEQID_SHIFT) | 0);
-	}
-	while (qspi_read32(priv->flags, &regs->sr) & QSPI_SR_BUSY_MASK)
-		;
-
-	qspi_write32(priv->flags, &regs->mcr, mcr_reg);
+	memcpy_fromio(op->data.buf.in,
+		      q->ahb_addr + q->selected * q->devtype_data->ahb_buf_size,
+		      op->data.nbytes);
 }
 
-int qspi_xfer(struct fsl_qspi_priv *priv, unsigned int bitlen,
-		const void *dout, void *din, unsigned long flags)
+static void fsl_qspi_fill_txfifo(struct fsl_qspi *q,
+				 const struct spi_mem_op *op)
 {
-	u32 bytes = DIV_ROUND_UP(bitlen, 8);
-	static u32 wr_sfaddr;
-	u32 txbuf;
-
-	WATCHDOG_RESET();
-
-	if (dout) {
-		if (flags & SPI_XFER_BEGIN) {
-			priv->cur_seqid = *(u8 *)dout;
-			memcpy(&txbuf, dout, 4);
-		}
-
-		if (flags == SPI_XFER_END) {
-			priv->sf_addr = wr_sfaddr;
-			qspi_op_write(priv, (u8 *)dout, bytes);
-			return 0;
-		}
-
-		if (priv->cur_seqid == QSPI_CMD_FAST_READ ||
-		    priv->cur_seqid == QSPI_CMD_RDAR) {
-			priv->sf_addr = swab32(txbuf) & OFFSET_BITS_MASK;
-		} else if ((priv->cur_seqid == QSPI_CMD_SE) ||
-			   (priv->cur_seqid == QSPI_CMD_BE_4K)) {
-			priv->sf_addr = swab32(txbuf) & OFFSET_BITS_MASK;
-			qspi_op_erase(priv);
-		} else if (priv->cur_seqid == QSPI_CMD_PP ||
-			   priv->cur_seqid == QSPI_CMD_WRAR) {
-			wr_sfaddr = swab32(txbuf) & OFFSET_BITS_MASK;
-		} else if ((priv->cur_seqid == QSPI_CMD_BRWR) ||
-			 (priv->cur_seqid == QSPI_CMD_WREAR)) {
-#ifdef CONFIG_SPI_FLASH_BAR
-			wr_sfaddr = 0;
-#endif
-		}
-	}
+	void __iomem *base = q->iobase;
+	int i;
+	u32 val;
 
-	if (din) {
-		if (priv->cur_seqid == QSPI_CMD_FAST_READ) {
-#ifdef CONFIG_SYS_FSL_QSPI_AHB
-			qspi_ahb_read(priv, din, bytes);
-#else
-			qspi_op_read(priv, din, bytes);
-#endif
-		} else if (priv->cur_seqid == QSPI_CMD_RDAR) {
-			qspi_op_read(priv, din, bytes);
-		} else if (priv->cur_seqid == QSPI_CMD_RDID)
-			qspi_op_rdid(priv, din, bytes);
-		else if (priv->cur_seqid == QSPI_CMD_RDSR)
-			qspi_op_rdsr(priv, din, bytes);
-#ifdef CONFIG_SPI_FLASH_BAR
-		else if ((priv->cur_seqid == QSPI_CMD_BRRD) ||
-			 (priv->cur_seqid == QSPI_CMD_RDEAR)) {
-			priv->sf_addr = 0;
-			qspi_op_rdbank(priv, din, bytes);
-		}
-#endif
+	for (i = 0; i < ALIGN_DOWN(op->data.nbytes, 4); i += 4) {
+		memcpy(&val, op->data.buf.out + i, 4);
+		val = fsl_qspi_endian_xchg(q, val);
+		qspi_writel(q, val, base + QUADSPI_TBDR);
 	}
 
-#ifdef CONFIG_SYS_FSL_QSPI_AHB
-	if ((priv->cur_seqid == QSPI_CMD_SE) ||
-	    (priv->cur_seqid == QSPI_CMD_PP) ||
-	    (priv->cur_seqid == QSPI_CMD_BE_4K) ||
-	    (priv->cur_seqid == QSPI_CMD_WREAR) ||
-	    (priv->cur_seqid == QSPI_CMD_BRWR))
-		qspi_ahb_invalid(priv);
-#endif
+	if (i < op->data.nbytes) {
+		memcpy(&val, op->data.buf.out + i, op->data.nbytes - i);
+		val = fsl_qspi_endian_xchg(q, val);
+		qspi_writel(q, val, base + QUADSPI_TBDR);
+	}
 
-	return 0;
+	if (needs_fill_txfifo(q)) {
+		for (i = op->data.nbytes; i < 16; i += 4)
+			qspi_writel(q, 0, base + QUADSPI_TBDR);
+	}
 }
 
-void qspi_module_disable(struct fsl_qspi_priv *priv, u8 disable)
+static void fsl_qspi_read_rxfifo(struct fsl_qspi *q,
+				 const struct spi_mem_op *op)
 {
-	u32 mcr_val;
+	void __iomem *base = q->iobase;
+	int i;
+	u8 *buf = op->data.buf.in;
+	u32 val;
 
-	mcr_val = qspi_read32(priv->flags, &priv->regs->mcr);
-	if (disable)
-		mcr_val |= QSPI_MCR_MDIS_MASK;
-	else
-		mcr_val &= ~QSPI_MCR_MDIS_MASK;
-	qspi_write32(priv->flags, &priv->regs->mcr, mcr_val);
+	for (i = 0; i < ALIGN_DOWN(op->data.nbytes, 4); i += 4) {
+		val = qspi_readl(q, base + QUADSPI_RBDR(i / 4));
+		val = fsl_qspi_endian_xchg(q, val);
+		memcpy(buf + i, &val, 4);
+	}
+
+	if (i < op->data.nbytes) {
+		val = qspi_readl(q, base + QUADSPI_RBDR(i / 4));
+		val = fsl_qspi_endian_xchg(q, val);
+		memcpy(buf + i, &val, op->data.nbytes - i);
+	}
 }
 
-void qspi_cfg_smpr(struct fsl_qspi_priv *priv, u32 clear_bits, u32 set_bits)
+static int fsl_qspi_readl_poll_tout(struct fsl_qspi *q, void __iomem *base,
+				    u32 mask, u32 delay_us, u32 timeout_us)
 {
-	u32 smpr_val;
+	u32 reg;
+
+	if (!q->devtype_data->little_endian)
+		mask = (u32)cpu_to_be32(mask);
 
-	smpr_val = qspi_read32(priv->flags, &priv->regs->smpr);
-	smpr_val &= ~clear_bits;
-	smpr_val |= set_bits;
-	qspi_write32(priv->flags, &priv->regs->smpr, smpr_val);
+	return readl_poll_timeout(base, reg, !(reg & mask), timeout_us);
 }
 
-static int fsl_qspi_child_pre_probe(struct udevice *dev)
+static int fsl_qspi_do_op(struct fsl_qspi *q, const struct spi_mem_op *op)
 {
-	struct spi_slave *slave = dev_get_parent_priv(dev);
-	struct fsl_qspi_priv *priv = dev_get_priv(dev_get_parent(dev));
+	void __iomem *base = q->iobase;
+	int err = 0;
 
-	slave->max_write_size = priv->devtype_data->txfifo;
+	/*
+	 * Always start the sequence at the same index since we update
+	 * the LUT at each exec_op() call. And also specify the DATA
+	 * length, since it's has not been specified in the LUT.
+	 */
+	qspi_writel(q, op->data.nbytes | QUADSPI_IPCR_SEQID(SEQID_LUT),
+		    base + QUADSPI_IPCR);
 
-	return 0;
+	/* wait for the controller being ready */
+	err = fsl_qspi_readl_poll_tout(q, base + QUADSPI_SR, (QUADSPI_SR_IP_ACC_MASK |
+				 QUADSPI_SR_AHB_ACC_MASK), 10, 1000);
+
+	if (!err && op->data.nbytes && op->data.dir == SPI_MEM_DATA_IN)
+		fsl_qspi_read_rxfifo(q, op);
+
+	return err;
 }
 
-static int fsl_qspi_probe(struct udevice *bus)
+static int fsl_qspi_exec_op(struct spi_slave *slave,
+			    const struct spi_mem_op *op)
 {
-	u32 amba_size_per_chip;
-	struct fsl_qspi_platdata *plat = dev_get_platdata(bus);
-	struct fsl_qspi_priv *priv = dev_get_priv(bus);
-	struct dm_spi_bus *dm_spi_bus;
-	int i, ret;
+	struct fsl_qspi *q = dev_get_priv(slave->dev->parent);
+	void __iomem *base = q->iobase;
+	u32 addr_offset = 0;
+	int err = 0;
+
+	/* wait for the controller being ready */
+	fsl_qspi_readl_poll_tout(q, base + QUADSPI_SR, (QUADSPI_SR_IP_ACC_MASK |
+				 QUADSPI_SR_AHB_ACC_MASK), 10, 1000);
 
-	dm_spi_bus = bus->uclass_priv;
+	fsl_qspi_select_mem(q, slave);
 
-	dm_spi_bus->max_hz = plat->speed_hz;
+	if (needs_amba_base_offset(q))
+		addr_offset = q->memmap_phy;
 
-	priv->regs = (struct fsl_qspi_regs *)(uintptr_t)plat->reg_base;
-	priv->flags = plat->flags;
+	qspi_writel(q,
+		    q->selected * q->devtype_data->ahb_buf_size + addr_offset,
+		    base + QUADSPI_SFAR);
+
+	qspi_writel(q, qspi_readl(q, base + QUADSPI_MCR) |
+		    QUADSPI_MCR_CLR_RXF_MASK | QUADSPI_MCR_CLR_TXF_MASK,
+		    base + QUADSPI_MCR);
+
+	qspi_writel(q, QUADSPI_SPTRCLR_BFPTRC | QUADSPI_SPTRCLR_IPPTRC,
+		    base + QUADSPI_SPTRCLR);
+
+	fsl_qspi_prepare_lut(q, op);
 
-	priv->speed_hz = plat->speed_hz;
 	/*
-	 * QSPI SFADR width is 32bits, the max dest addr is 4GB-1.
-	 * AMBA memory zone should be located on the 0~4GB space
-	 * even on a 64bits cpu.
+	 * If we have large chunks of data, we read them through the AHB bus
+	 * by accessing the mapped memory. In all other cases we use
+	 * IP commands to access the flash.
 	 */
-	priv->amba_base[0] = (u32)plat->amba_base;
-	priv->amba_total_size = (u32)plat->amba_total_size;
-	priv->flash_num = plat->flash_num;
-	priv->num_chipselect = plat->num_chipselect;
-
-	priv->devtype_data = (struct fsl_qspi_devtype_data *)dev_get_driver_data(bus);
-	if (!priv->devtype_data) {
-		printf("ERROR : No devtype_data found\n");
-		return -ENODEV;
+	if (op->data.nbytes > (q->devtype_data->rxfifo - 4) &&
+	    op->data.dir == SPI_MEM_DATA_IN) {
+		fsl_qspi_read_ahb(q, op);
+	} else {
+		qspi_writel(q, QUADSPI_RBCT_WMRK_MASK |
+			    QUADSPI_RBCT_RXBRD_USEIPS, base + QUADSPI_RBCT);
+
+		if (op->data.nbytes && op->data.dir == SPI_MEM_DATA_OUT)
+			fsl_qspi_fill_txfifo(q, op);
+
+		err = fsl_qspi_do_op(q, op);
 	}
 
-	debug("devtype=%d, txfifo=%d, rxfifo=%d, ahb=%d, data=0x%x\n",
-		priv->devtype_data->devtype,
-		priv->devtype_data->txfifo,
-		priv->devtype_data->rxfifo,
-		priv->devtype_data->ahb_buf_size,
-		priv->devtype_data->driver_data);
+	/* Invalidate the data in the AHB buffer. */
+	fsl_qspi_invalidate(q);
 
-	/* make sure controller is not busy anywhere */
-	ret = is_controller_busy(priv);
+	return err;
+}
 
-	if (ret) {
-		debug("ERROR : The controller is busy\n");
-		return ret;
+static int fsl_qspi_adjust_op_size(struct spi_slave *slave,
+				   struct spi_mem_op *op)
+{
+	struct fsl_qspi *q = dev_get_priv(slave->dev->parent);
+
+	if (op->data.dir == SPI_MEM_DATA_OUT) {
+		if (op->data.nbytes > q->devtype_data->txfifo)
+			op->data.nbytes = q->devtype_data->txfifo;
+	} else {
+		if (op->data.nbytes > q->devtype_data->ahb_buf_size)
+			op->data.nbytes = q->devtype_data->ahb_buf_size;
+		else if (op->data.nbytes > (q->devtype_data->rxfifo - 4))
+			op->data.nbytes = ALIGN_DOWN(op->data.nbytes, 8);
 	}
 
-	qspi_write32(priv->flags, &priv->regs->mcr,
-		     QSPI_MCR_RESERVED_MASK | QSPI_MCR_MDIS_MASK |
-		     QSPI_MCR_END_CFD_LE);
+	return 0;
+}
 
-	qspi_cfg_smpr(priv, ~(QSPI_SMPR_FSDLY_MASK | QSPI_SMPR_DDRSMP_MASK |
-		QSPI_SMPR_FSPHS_MASK | QSPI_SMPR_HSENA_MASK), 0);
+static int fsl_qspi_default_setup(struct fsl_qspi *q)
+{
+	void __iomem *base = q->iobase;
+	u32 reg, addr_offset = 0;
+
+	/* Reset the module */
+	qspi_writel(q, QUADSPI_MCR_SWRSTSD_MASK | QUADSPI_MCR_SWRSTHD_MASK,
+		    base + QUADSPI_MCR);
+	udelay(1);
+
+	/* Disable the module */
+	qspi_writel(q, QUADSPI_MCR_MDIS_MASK | QUADSPI_MCR_RESERVED_MASK,
+		    base + QUADSPI_MCR);
 
 	/*
-	 * Assign AMBA memory zone for every chipselect
-	 * QuadSPI has two channels, every channel has two chipselects.
-	 * If the property 'num-cs' in dts is 2, the AMBA memory will be divided
-	 * into two parts and assign to every channel. This indicate that every
-	 * channel only has one valid chipselect.
-	 * If the property 'num-cs' in dts is 4, the AMBA memory will be divided
-	 * into four parts and assign to every chipselect.
-	 * Every channel will has two valid chipselects.
+	 * Previous boot stages (BootROM, bootloader) might have used DDR
+	 * mode and did not clear the TDH bits. As we currently use SDR mode
+	 * only, clear the TDH bits if necessary.
 	 */
-	amba_size_per_chip = priv->amba_total_size >>
-			     (priv->num_chipselect >> 1);
-	for (i = 1 ; i < priv->num_chipselect ; i++)
-		priv->amba_base[i] =
-			amba_size_per_chip + priv->amba_base[i - 1];
+	if (needs_tdh_setting(q))
+		qspi_writel(q, qspi_readl(q, base + QUADSPI_FLSHCR) &
+			    ~QUADSPI_FLSHCR_TDH_MASK,
+			    base + QUADSPI_FLSHCR);
+
+	reg = qspi_readl(q, base + QUADSPI_SMPR);
+	qspi_writel(q, reg & ~(QUADSPI_SMPR_FSDLY_MASK
+			| QUADSPI_SMPR_FSPHS_MASK
+			| QUADSPI_SMPR_HSENA_MASK
+			| QUADSPI_SMPR_DDRSMP_MASK), base + QUADSPI_SMPR);
+
+	/* We only use the buffer3 for AHB read */
+	qspi_writel(q, 0, base + QUADSPI_BUF0IND);
+	qspi_writel(q, 0, base + QUADSPI_BUF1IND);
+	qspi_writel(q, 0, base + QUADSPI_BUF2IND);
+
+	qspi_writel(q, QUADSPI_BFGENCR_SEQID(SEQID_LUT),
+		    q->iobase + QUADSPI_BFGENCR);
+	qspi_writel(q, QUADSPI_RBCT_WMRK_MASK, base + QUADSPI_RBCT);
+	qspi_writel(q, QUADSPI_BUF3CR_ALLMST_MASK |
+		    QUADSPI_BUF3CR_ADATSZ(q->devtype_data->ahb_buf_size / 8),
+		    base + QUADSPI_BUF3CR);
+
+	if (needs_amba_base_offset(q))
+		addr_offset = q->memmap_phy;
 
 	/*
-	 * Any read access to non-implemented addresses will provide
-	 * undefined results.
-	 *
-	 * In case single die flash devices, TOP_ADDR_MEMA2 and
-	 * TOP_ADDR_MEMB2 should be initialized/programmed to
-	 * TOP_ADDR_MEMA1 and TOP_ADDR_MEMB1 respectively - in effect,
-	 * setting the size of these devices to 0.  This would ensure
-	 * that the complete memory map is assigned to only one flash device.
+	 * In HW there can be a maximum of four chips on two buses with
+	 * two chip selects on each bus. We use four chip selects in SW
+	 * to differentiate between the four chips.
+	 * We use ahb_buf_size for each chip and set SFA1AD, SFA2AD, SFB1AD,
+	 * SFB2AD accordingly.
 	 */
-	qspi_write32(priv->flags, &priv->regs->sfa1ad,
-		     priv->amba_base[0] + amba_size_per_chip);
-	switch (priv->num_chipselect) {
-	case 1:
-		break;
-	case 2:
-		qspi_write32(priv->flags, &priv->regs->sfa2ad,
-			     priv->amba_base[1]);
-		qspi_write32(priv->flags, &priv->regs->sfb1ad,
-			     priv->amba_base[1] + amba_size_per_chip);
-		qspi_write32(priv->flags, &priv->regs->sfb2ad,
-			     priv->amba_base[1] + amba_size_per_chip);
-		break;
-	case 4:
-		qspi_write32(priv->flags, &priv->regs->sfa2ad,
-			     priv->amba_base[2]);
-		qspi_write32(priv->flags, &priv->regs->sfb1ad,
-			     priv->amba_base[3]);
-		qspi_write32(priv->flags, &priv->regs->sfb2ad,
-			     priv->amba_base[3] + amba_size_per_chip);
-		break;
-	default:
-		debug("Error: Unsupported chipselect number %u!\n",
-		      priv->num_chipselect);
-		qspi_module_disable(priv, 1);
-		return -EINVAL;
-	}
-
-	qspi_set_lut(priv);
-
-#ifdef CONFIG_SYS_FSL_QSPI_AHB
-	qspi_init_ahb_read(priv);
-#endif
-
-	qspi_module_disable(priv, 0);
-
+	qspi_writel(q, q->devtype_data->ahb_buf_size + addr_offset,
+		    base + QUADSPI_SFA1AD);
+	qspi_writel(q, q->devtype_data->ahb_buf_size * 2 + addr_offset,
+		    base + QUADSPI_SFA2AD);
+	qspi_writel(q, q->devtype_data->ahb_buf_size * 3 + addr_offset,
+		    base + QUADSPI_SFB1AD);
+	qspi_writel(q, q->devtype_data->ahb_buf_size * 4 + addr_offset,
+		    base + QUADSPI_SFB2AD);
+
+	q->selected = -1;
+
+	/* Enable the module */
+	qspi_writel(q, QUADSPI_MCR_RESERVED_MASK | QUADSPI_MCR_END_CFG_MASK,
+		    base + QUADSPI_MCR);
 	return 0;
 }
 
-static int fsl_qspi_ofdata_to_platdata(struct udevice *bus)
+static const struct spi_controller_mem_ops fsl_qspi_mem_ops = {
+	.adjust_op_size = fsl_qspi_adjust_op_size,
+	.supports_op = fsl_qspi_supports_op,
+	.exec_op = fsl_qspi_exec_op,
+};
+
+static int fsl_qspi_probe(struct udevice *bus)
 {
-	struct fdt_resource res_regs, res_mem;
-	struct fsl_qspi_platdata *plat = bus->platdata;
+	struct dm_spi_bus *dm_bus = bus->uclass_priv;
+	struct fsl_qspi *q = dev_get_priv(bus);
 	const void *blob = gd->fdt_blob;
 	int node = dev_of_offset(bus);
-	int ret, flash_num = 0, subnode;
+	struct fdt_resource res;
+	int ret;
 
-	if (fdtdec_get_bool(blob, node, "big-endian"))
-		plat->flags |= QSPI_FLAG_REGMAP_ENDIAN_BIG;
+	q->devtype_data = (struct fsl_qspi_devtype_data *)
+			   dev_get_driver_data(bus);
 
-	ret = fdt_get_named_resource(blob, node, "reg", "reg-names",
-				     "QuadSPI", &res_regs);
+	/* find the resources */
+	ret = fdt_get_named_resource(blob, node, "reg", "reg-names", "QuadSPI",
+				     &res);
 	if (ret) {
-		debug("Error: can't get regs base addresses(ret = %d)!\n", ret);
+		dev_err(dev, "Can't get regs base addresses(ret = %d)!\n", ret);
 		return -ENOMEM;
 	}
+
+	q->iobase = map_physmem(res.start, res.end - res.start, MAP_NOCACHE);
+
 	ret = fdt_get_named_resource(blob, node, "reg", "reg-names",
-				     "QuadSPI-memory", &res_mem);
+				     "QuadSPI-memory", &res);
 	if (ret) {
-		debug("Error: can't get AMBA base addresses(ret = %d)!\n", ret);
+		dev_err(dev, "Can't get AMBA base addresses(ret = %d)!\n", ret);
 		return -ENOMEM;
 	}
 
-	/* Count flash numbers */
-	fdt_for_each_subnode(subnode, blob, node)
-		++flash_num;
+	q->ahb_addr = map_physmem(res.start, res.end - res.start, MAP_NOCACHE);
+	q->memmap_phy = res.start;
 
-	if (flash_num == 0) {
-		debug("Error: Missing flashes!\n");
-		return -ENODEV;
-	}
+	dm_bus->max_hz = fdtdec_get_int(blob, node, "spi-max-frequency",
+					66000000);
 
-	plat->speed_hz = fdtdec_get_int(blob, node, "spi-max-frequency",
-					FSL_QSPI_DEFAULT_SCK_FREQ);
-	plat->num_chipselect = fdtdec_get_int(blob, node, "num-cs",
-					      FSL_QSPI_MAX_CHIPSELECT_NUM);
-
-	plat->reg_base = res_regs.start;
-	plat->amba_base = res_mem.start;
-	plat->amba_total_size = res_mem.end - res_mem.start + 1;
-	plat->flash_num = flash_num;
-
-	debug("%s: regs=<0x%llx> <0x%llx, 0x%llx>, max-frequency=%d, endianess=%s\n",
-	      __func__,
-	      (u64)plat->reg_base,
-	      (u64)plat->amba_base,
-	      (u64)plat->amba_total_size,
-	      plat->speed_hz,
-	      plat->flags & QSPI_FLAG_REGMAP_ENDIAN_BIG ? "be" : "le"
-	      );
+	fsl_qspi_default_setup(q);
 
 	return 0;
 }
 
 static int fsl_qspi_xfer(struct udevice *dev, unsigned int bitlen,
-		const void *dout, void *din, unsigned long flags)
+			 const void *dout, void *din, unsigned long flags)
 {
-	struct fsl_qspi_priv *priv;
-	struct udevice *bus;
-
-	bus = dev->parent;
-	priv = dev_get_priv(bus);
-
-	return qspi_xfer(priv, bitlen, dout, din, flags);
+	return 0;
 }
 
 static int fsl_qspi_claim_bus(struct udevice *dev)
 {
-	struct fsl_qspi_priv *priv;
-	struct udevice *bus;
-	struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev);
-	int ret;
-
-	bus = dev->parent;
-	priv = dev_get_priv(bus);
-
-	/* make sure controller is not busy anywhere */
-	ret = is_controller_busy(priv);
-
-	if (ret) {
-		debug("ERROR : The controller is busy\n");
-		return ret;
-	}
-
-	priv->cur_amba_base = priv->amba_base[slave_plat->cs];
-
-	qspi_module_disable(priv, 0);
-
 	return 0;
 }
 
 static int fsl_qspi_release_bus(struct udevice *dev)
 {
-	struct fsl_qspi_priv *priv;
-	struct udevice *bus;
-
-	bus = dev->parent;
-	priv = dev_get_priv(bus);
-
-	qspi_module_disable(priv, 1);
-
 	return 0;
 }
 
 static int fsl_qspi_set_speed(struct udevice *bus, uint speed)
 {
-	/* Nothing to do */
 	return 0;
 }
 
 static int fsl_qspi_set_mode(struct udevice *bus, uint mode)
 {
-	/* Nothing to do */
 	return 0;
 }
 
@@ -1146,14 +770,17 @@ static const struct dm_spi_ops fsl_qspi_ops = {
 	.xfer		= fsl_qspi_xfer,
 	.set_speed	= fsl_qspi_set_speed,
 	.set_mode	= fsl_qspi_set_mode,
+	.mem_ops	= &fsl_qspi_mem_ops,
 };
 
 static const struct udevice_id fsl_qspi_ids[] = {
-	{ .compatible = "fsl,vf610-qspi", .data = (ulong)&vybrid_data },
-	{ .compatible = "fsl,imx6sx-qspi", .data = (ulong)&imx6sx_data },
-	{ .compatible = "fsl,imx6ul-qspi", .data = (ulong)&imx6ul_7d_data },
-	{ .compatible = "fsl,imx7d-qspi", .data = (ulong)&imx6ul_7d_data },
-	{ .compatible = "fsl,imx7ulp-qspi", .data = (ulong)&imx7ulp_data },
+	{ .compatible = "fsl,vf610-qspi", .data = (ulong)&vybrid_data, },
+	{ .compatible = "fsl,imx6sx-qspi", .data = (ulong)&imx6sx_data, },
+	{ .compatible = "fsl,imx6ul-qspi", .data = (ulong)&imx6ul_data, },
+	{ .compatible = "fsl,imx7d-qspi", .data = (ulong)&imx7d_data, },
+	{ .compatible = "fsl,ls1021a-qspi", .data = (ulong)&ls1021a_data, },
+	{ .compatible = "fsl,ls1088a-qspi", .data = (ulong)&ls1088a_data, },
+	{ .compatible = "fsl,ls2080a-qspi", .data = (ulong)&ls2080a_data, },
 	{ }
 };
 
@@ -1162,9 +789,6 @@ U_BOOT_DRIVER(fsl_qspi) = {
 	.id	= UCLASS_SPI,
 	.of_match = fsl_qspi_ids,
 	.ops	= &fsl_qspi_ops,
-	.ofdata_to_platdata = fsl_qspi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct fsl_qspi_platdata),
-	.priv_auto_alloc_size = sizeof(struct fsl_qspi_priv),
+	.priv_auto_alloc_size = sizeof(struct fsl_qspi),
 	.probe	= fsl_qspi_probe,
-	.child_pre_probe = fsl_qspi_child_pre_probe,
 };
diff --git a/drivers/spi/fsl_qspi.h b/drivers/spi/fsl_qspi.h
deleted file mode 100644
index 9e61a852b5..0000000000
--- a/drivers/spi/fsl_qspi.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright 2013-2014 Freescale Semiconductor, Inc.
- *
- * Register definitions for Freescale QSPI
- */
-
-#ifndef _FSL_QSPI_H_
-#define _FSL_QSPI_H_
-
-struct fsl_qspi_regs {
-	u32 mcr;
-	u32 rsvd0[1];
-	u32 ipcr;
-	u32 flshcr;
-	u32 buf0cr;
-	u32 buf1cr;
-	u32 buf2cr;
-	u32 buf3cr;
-	u32 bfgencr;
-	u32 soccr;
-	u32 rsvd1[2];
-	u32 buf0ind;
-	u32 buf1ind;
-	u32 buf2ind;
-	u32 rsvd2[49];
-	u32 sfar;
-	u32 rsvd3[1];
-	u32 smpr;
-	u32 rbsr;
-	u32 rbct;
-	u32 rsvd4[15];
-	u32 tbsr;
-	u32 tbdr;
-	u32 rsvd5[1];
-	u32 sr;
-	u32 fr;
-	u32 rser;
-	u32 spndst;
-	u32 sptrclr;
-	u32 rsvd6[4];
-	u32 sfa1ad;
-	u32 sfa2ad;
-	u32 sfb1ad;
-	u32 sfb2ad;
-	u32 rsvd7[28];
-	u32 rbdr[32];
-	u32 rsvd8[32];
-	u32 lutkey;
-	u32 lckcr;
-	u32 rsvd9[2];
-	u32 lut[64];
-};
-
-#define QSPI_IPCR_SEQID_SHIFT		24
-#define QSPI_IPCR_SEQID_MASK		(0xf << QSPI_IPCR_SEQID_SHIFT)
-
-#define QSPI_MCR_END_CFD_SHIFT		2
-#define QSPI_MCR_END_CFD_MASK		(3 << QSPI_MCR_END_CFD_SHIFT)
-#ifdef CONFIG_SYS_FSL_QSPI_AHB
-/* AHB needs 64bit operation */
-#define QSPI_MCR_END_CFD_LE		(3 << QSPI_MCR_END_CFD_SHIFT)
-#else
-#define QSPI_MCR_END_CFD_LE		(1 << QSPI_MCR_END_CFD_SHIFT)
-#endif
-#define QSPI_MCR_DDR_EN_SHIFT		7
-#define QSPI_MCR_DDR_EN_MASK		(1 << QSPI_MCR_DDR_EN_SHIFT)
-#define QSPI_MCR_CLR_RXF_SHIFT		10
-#define QSPI_MCR_CLR_RXF_MASK		(1 << QSPI_MCR_CLR_RXF_SHIFT)
-#define QSPI_MCR_CLR_TXF_SHIFT		11
-#define QSPI_MCR_CLR_TXF_MASK		(1 << QSPI_MCR_CLR_TXF_SHIFT)
-#define QSPI_MCR_MDIS_SHIFT		14
-#define QSPI_MCR_MDIS_MASK		(1 << QSPI_MCR_MDIS_SHIFT)
-#define QSPI_MCR_RESERVED_SHIFT		16
-#define QSPI_MCR_RESERVED_MASK		(0xf << QSPI_MCR_RESERVED_SHIFT)
-#define QSPI_MCR_SWRSTHD_SHIFT		1
-#define QSPI_MCR_SWRSTHD_MASK		(1 << QSPI_MCR_SWRSTHD_SHIFT)
-#define QSPI_MCR_SWRSTSD_SHIFT		0
-#define QSPI_MCR_SWRSTSD_MASK		(1 << QSPI_MCR_SWRSTSD_SHIFT)
-
-#define QSPI_SMPR_HSENA_SHIFT		0
-#define QSPI_SMPR_HSENA_MASK		(1 << QSPI_SMPR_HSENA_SHIFT)
-#define QSPI_SMPR_FSPHS_SHIFT		5
-#define QSPI_SMPR_FSPHS_MASK		(1 << QSPI_SMPR_FSPHS_SHIFT)
-#define QSPI_SMPR_FSDLY_SHIFT		6
-#define QSPI_SMPR_FSDLY_MASK		(1 << QSPI_SMPR_FSDLY_SHIFT)
-#define QSPI_SMPR_DDRSMP_SHIFT		16
-#define QSPI_SMPR_DDRSMP_MASK		(7 << QSPI_SMPR_DDRSMP_SHIFT)
-
-#define QSPI_BUFXCR_INVALID_MSTRID	0xe
-#define QSPI_BUF3CR_ALLMST_SHIFT	31
-#define QSPI_BUF3CR_ALLMST_MASK		(1 << QSPI_BUF3CR_ALLMST_SHIFT)
-#define QSPI_BUF3CR_ADATSZ_SHIFT	8
-#define QSPI_BUF3CR_ADATSZ_MASK		(0xFF << QSPI_BUF3CR_ADATSZ_SHIFT)
-
-#define QSPI_BFGENCR_SEQID_SHIFT	12
-#define QSPI_BFGENCR_SEQID_MASK		(0xf << QSPI_BFGENCR_SEQID_SHIFT)
-#define QSPI_BFGENCR_PAR_EN_SHIFT	16
-#define QSPI_BFGENCR_PAR_EN_MASK	(1 << QSPI_BFGENCR_PAR_EN_SHIFT)
-
-#define QSPI_RBSR_RDBFL_SHIFT		8
-#define QSPI_RBSR_RDBFL_MASK		(0x3f << QSPI_RBSR_RDBFL_SHIFT)
-
-#define QSPI_RBCT_RXBRD_SHIFT		8
-#define QSPI_RBCT_RXBRD_USEIPS		(1 << QSPI_RBCT_RXBRD_SHIFT)
-
-#define QSPI_SR_AHB_ACC_SHIFT		2
-#define QSPI_SR_AHB_ACC_MASK		(1 << QSPI_SR_AHB_ACC_SHIFT)
-#define QSPI_SR_IP_ACC_SHIFT		1
-#define QSPI_SR_IP_ACC_MASK		(1 << QSPI_SR_IP_ACC_SHIFT)
-#define QSPI_SR_BUSY_SHIFT		0
-#define QSPI_SR_BUSY_MASK		(1 << QSPI_SR_BUSY_SHIFT)
-
-#define QSPI_LCKCR_LOCK			0x1
-#define QSPI_LCKCR_UNLOCK		0x2
-
-#define LUT_KEY_VALUE			0x5af05af0
-
-#define OPRND0_SHIFT			0
-#define OPRND0(x)			((x) << OPRND0_SHIFT)
-#define PAD0_SHIFT			8
-#define PAD0(x)				((x) << PAD0_SHIFT)
-#define INSTR0_SHIFT			10
-#define INSTR0(x)			((x) << INSTR0_SHIFT)
-#define OPRND1_SHIFT			16
-#define OPRND1(x)			((x) << OPRND1_SHIFT)
-#define PAD1_SHIFT			24
-#define PAD1(x)				((x) << PAD1_SHIFT)
-#define INSTR1_SHIFT			26
-#define INSTR1(x)			((x) << INSTR1_SHIFT)
-
-#define LUT_CMD				1
-#define LUT_ADDR			2
-#define LUT_DUMMY			3
-#define LUT_READ			7
-#define LUT_WRITE			8
-
-#define LUT_PAD1			0
-#define LUT_PAD2			1
-#define LUT_PAD4			2
-
-#define ADDR24BIT			0x18
-#define ADDR32BIT			0x20
-
-#endif /* _FSL_QSPI_H_ */
-- 
2.17.1

[Patch v2 1/7] spi: Transform the FSL QuadSPI driver to use the SPI MEM API

[Priyanka Jain]

>-----Original Message-----
>From: Kuldeep Singh <kuldeep.singh@nxp.com>
>Sent: Monday, December 16, 2019 5:19 PM
>To: u-boot at lists.denx.de
>Cc: jagan at amarulasolutions.com; Priyanka Jain <priyanka.jain@nxp.com>;
>sr at denx.de; Ashish Kumar <ashish.kumar@nxp.com>;
>frieder.schrempf at kontron.de; Kuldeep Singh <kuldeep.singh@nxp.com>; Ashish
>Kumar <ashish.kumar@nxp.com>
>Subject: [Patch v2 1/7] spi: Transform the FSL QuadSPI driver to use the SPI MEM
>API
>
>To support the SPI MEM API, instead of modifying the existing U-Boot
>driver, this patch adds a port of the existing Linux driver.
>This also has the advantage that porting changes and fixes from Linux
>will be easier.
>Porting of driver left most of the functions unchanged while few of the
>changes are:
>-Remove lock(mutexes) and irq handler as uboot is a single core execution.
>-Remove clock support as the changing spi speed is not supported in
>uboot and nor in linux.
>
>Currently tested on LS1088ARDB, LS1012ARDB, LS1046ARDB, LS1046AFRWY,
>LS1043AQDS, LS1021ATWR, LS2080ARDB
>
>Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de>
>Signed-off-by: Ashish Kumar <Ashish.Kumar@nxp.com>
>Signed-off-by: Kuldeep Singh <kuldeep.singh@nxp.com>
>---
> drivers/spi/fsl_qspi.c | 1562 +++++++++++++++-------------------------
> drivers/spi/fsl_qspi.h |  145 ----
> 2 files changed, 593 insertions(+), 1114 deletions(-)
> delete mode 100644 drivers/spi/fsl_qspi.h
>
>diff --git a/drivers/spi/fsl_qspi.c b/drivers/spi/fsl_qspi.c
>index 8e2a09df36..96178c06bc 100644
>--- a/drivers/spi/fsl_qspi.c
>+++ b/drivers/spi/fsl_qspi.c
>@@ -1,1142 +1,766 @@
> // SPDX-License-Identifier: GPL-2.0+
>+
> /*
>- * Copyright 2013-2015 Freescale Semiconductor, Inc.
>+ * Freescale QuadSPI driver.
>+ *
>+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
>+ * Copyright (C) 2018 Bootlin
>+ * Copyright (C) 2018 exceet electronics GmbH
>+ * Copyright (C) 2018 Kontron Electronics GmbH
>+ * Copyright (C) 2019-2020 NXP
Please check copyright format
It seems the changes have been brought from Linux driver.
If yes, it would be good to mention that in File header
>  *
>- * Freescale Quad Serial Peripheral Interface (QSPI) driver
>+ * Based on the original fsl-quadspi.c spi-nor driver.
>+ * Transition to spi-mem in spi-fsl-qspi.c
>  */
>
> #include <common.h>
>-#include <malloc.h>
>-#include <spi.h>
> #include <asm/io.h>
>-#include <linux/sizes.h>
>-#include <linux/iopoll.h>
> #include <dm.h>
>-#include <errno.h>
>-#include <watchdog.h>
>-#include <wait_bit.h>
>-#include "fsl_qspi.h"
>+#include <linux/iopoll.h>
>+#include <linux/sizes.h>
>+#include <spi.h>
>+#include <spi-mem.h>
>
> DECLARE_GLOBAL_DATA_PTR;
>
>-#define OFFSET_BITS_MASK	GENMASK(23, 0)
>-
>-#define FLASH_STATUS_WEL	0x02
>-
>-/* SEQID */
>-#define SEQID_WREN		1
>-#define SEQID_FAST_READ		2
>-#define SEQID_RDSR		3
>-#define SEQID_SE		4
>-#define SEQID_CHIP_ERASE	5
>-#define SEQID_PP		6
>-#define SEQID_RDID		7
>-#define SEQID_BE_4K		8
>-#ifdef CONFIG_SPI_FLASH_BAR
>-#define SEQID_BRRD		9
>-#define SEQID_BRWR		10
>-#define SEQID_RDEAR		11
>-#define SEQID_WREAR		12
>-#endif
>-#define SEQID_WRAR		13
>-#define SEQID_RDAR		14
>-
>-/* QSPI CMD */
>-#define QSPI_CMD_PP		0x02	/* Page program (up to 256 bytes) */
>-#define QSPI_CMD_RDSR		0x05	/* Read status register */
>-#define QSPI_CMD_WREN		0x06	/* Write enable */
>-#define QSPI_CMD_FAST_READ	0x0b	/* Read data bytes (high
>frequency) */
>-#define QSPI_CMD_BE_4K		0x20    /* 4K erase */
>-#define QSPI_CMD_CHIP_ERASE	0xc7	/* Erase whole flash chip */
>-#define QSPI_CMD_SE		0xd8	/* Sector erase (usually 64KiB) */
>-#define QSPI_CMD_RDID		0x9f	/* Read JEDEC ID */
>-
>-/* Used for Micron, winbond and Macronix flashes */
>-#define	QSPI_CMD_WREAR		0xc5	/* EAR register write */
>-#define	QSPI_CMD_RDEAR		0xc8	/* EAR reigster read */
>-
>-/* Used for Spansion flashes only. */
>-#define	QSPI_CMD_BRRD		0x16	/* Bank register read
>*/
>-#define	QSPI_CMD_BRWR		0x17	/* Bank register write
>*/
>-
>-/* Used for Spansion S25FS-S family flash only. */
>-#define QSPI_CMD_RDAR		0x65	/* Read any device register */
>-#define QSPI_CMD_WRAR		0x71	/* Write any device register */
>-
>-/* 4-byte address QSPI CMD - used on Spansion and some Macronix flashes */
>-#define QSPI_CMD_FAST_READ_4B	0x0c    /* Read data bytes (high
>frequency) */
>-#define QSPI_CMD_PP_4B		0x12    /* Page program (up to 256
>bytes) */
>-#define QSPI_CMD_SE_4B		0xdc    /* Sector erase (usually 64KiB)
>*/
>-
>-/* fsl_qspi_platdata flags */
>-#define QSPI_FLAG_REGMAP_ENDIAN_BIG	BIT(0)
>-
>-/* default SCK frequency, unit: HZ */
>-#define FSL_QSPI_DEFAULT_SCK_FREQ	50000000
>-
>-/* QSPI max chipselect signals number */
>-#define FSL_QSPI_MAX_CHIPSELECT_NUM     4
>-
>-/* Controller needs driver to swap endian */
>+/*
>+ * The driver only uses one single LUT entry, that is updated on
>+ * each call of exec_op(). Index 0 is preset at boot with a basic
>+ * read operation, so let's use the last entry (15).
>+ */
>+#define	SEQID_LUT			15
>+
>+/* Registers used by the driver */
>+#define QUADSPI_MCR			0x00
>+#define QUADSPI_MCR_RESERVED_MASK	GENMASK(19, 16)
>+#define QUADSPI_MCR_MDIS_MASK		BIT(14)
>+#define QUADSPI_MCR_CLR_TXF_MASK	BIT(11)
>+#define QUADSPI_MCR_CLR_RXF_MASK	BIT(10)
>+#define QUADSPI_MCR_DDR_EN_MASK		BIT(7)
>+#define QUADSPI_MCR_END_CFG_MASK	GENMASK(3, 2)
>+#define QUADSPI_MCR_SWRSTHD_MASK	BIT(1)
>+#define QUADSPI_MCR_SWRSTSD_MASK	BIT(0)
>+
>+#define QUADSPI_IPCR			0x08
>+#define QUADSPI_IPCR_SEQID(x)		((x) << 24)
>+#define QUADSPI_FLSHCR			0x0c
>+#define QUADSPI_FLSHCR_TCSS_MASK	GENMASK(3, 0)
>+#define QUADSPI_FLSHCR_TCSH_MASK	GENMASK(11, 8)
>+#define QUADSPI_FLSHCR_TDH_MASK		GENMASK(17, 16)
>+
>+#define QUADSPI_BUF3CR			0x1c
>+#define QUADSPI_BUF3CR_ALLMST_MASK	BIT(31)
>+#define QUADSPI_BUF3CR_ADATSZ(x)	((x) << 8)
>+#define QUADSPI_BUF3CR_ADATSZ_MASK	GENMASK(15, 8)
>+
>+#define QUADSPI_BFGENCR			0x20
>+#define QUADSPI_BFGENCR_SEQID(x)	((x) << 12)
>+
>+#define QUADSPI_BUF0IND			0x30
>+#define QUADSPI_BUF1IND			0x34
>+#define QUADSPI_BUF2IND			0x38
>+#define QUADSPI_SFAR			0x100
>+
>+#define QUADSPI_SMPR			0x108
>+#define QUADSPI_SMPR_DDRSMP_MASK	GENMASK(18, 16)
>+#define QUADSPI_SMPR_FSDLY_MASK		BIT(6)
>+#define QUADSPI_SMPR_FSPHS_MASK		BIT(5)
>+#define QUADSPI_SMPR_HSENA_MASK		BIT(0)
>+
>+#define QUADSPI_RBCT			0x110
>+#define QUADSPI_RBCT_WMRK_MASK		GENMASK(4, 0)
>+#define QUADSPI_RBCT_RXBRD_USEIPS	BIT(8)
>+
>+#define QUADSPI_TBDR			0x154
>+
>+#define QUADSPI_SR			0x15c
>+#define QUADSPI_SR_IP_ACC_MASK		BIT(1)
>+#define QUADSPI_SR_AHB_ACC_MASK		BIT(2)
>+
>+#define QUADSPI_FR			0x160
>+#define QUADSPI_FR_TFF_MASK		BIT(0)
>+
>+#define QUADSPI_RSER			0x164
>+#define QUADSPI_RSER_TFIE		BIT(0)
>+
>+#define QUADSPI_SPTRCLR			0x16c
>+#define QUADSPI_SPTRCLR_IPPTRC		BIT(8)
>+#define QUADSPI_SPTRCLR_BFPTRC		BIT(0)
>+
>+#define QUADSPI_SFA1AD			0x180
>+#define QUADSPI_SFA2AD			0x184
>+#define QUADSPI_SFB1AD			0x188
>+#define QUADSPI_SFB2AD			0x18c
>+#define QUADSPI_RBDR(x)			(0x200 + ((x) * 4))
>+
>+#define QUADSPI_LUTKEY			0x300
>+#define QUADSPI_LUTKEY_VALUE		0x5AF05AF0
>+
>+#define QUADSPI_LCKCR			0x304
>+#define QUADSPI_LCKER_LOCK		BIT(0)
>+#define QUADSPI_LCKER_UNLOCK		BIT(1)
>+
>+#define QUADSPI_LUT_BASE		0x310
>+#define QUADSPI_LUT_OFFSET		(SEQID_LUT * 4 * 4)
>+#define QUADSPI_LUT_REG(idx) \
>+	(QUADSPI_LUT_BASE + QUADSPI_LUT_OFFSET + (idx) * 4)
>+
>+/* Instruction set for the LUT register */
>+#define LUT_STOP		0
>+#define LUT_CMD			1
>+#define LUT_ADDR		2
>+#define LUT_DUMMY		3
>+#define LUT_MODE		4
>+#define LUT_MODE2		5
>+#define LUT_MODE4		6
>+#define LUT_FSL_READ		7
>+#define LUT_FSL_WRITE		8
>+#define LUT_JMP_ON_CS		9
>+#define LUT_ADDR_DDR		10
>+#define LUT_MODE_DDR		11
>+#define LUT_MODE2_DDR		12
>+#define LUT_MODE4_DDR		13
>+#define LUT_FSL_READ_DDR	14
>+#define LUT_FSL_WRITE_DDR	15
>+#define LUT_DATA_LEARN		16
>+
>+/*
>+ * The PAD definitions for LUT register.
>+ *
>+ * The pad stands for the number of IO lines [0:3].
>+ * For example, the quad read needs four IO lines,
>+ * so you should use LUT_PAD(4).
>+ */
>+#define LUT_PAD(x) (fls(x) - 1)
>+
>+/*
>+ * Macro for constructing the LUT entries with the following
>+ * register layout:
>+ *
>+ *  ---------------------------------------------------
>+ *  | INSTR1 | PAD1 | OPRND1 | INSTR0 | PAD0 | OPRND0 |
>+ *  ---------------------------------------------------
>+ */
>+#define LUT_DEF(idx, ins, pad, opr)					\
>+	((((ins) << 10) | ((pad) << 8) | (opr)) << (((idx) % 2) * 16))
>+
>+/* Controller needs driver to swap endianness */
> #define QUADSPI_QUIRK_SWAP_ENDIAN	BIT(0)
>
>-enum fsl_qspi_devtype {
>-	FSL_QUADSPI_VYBRID,
>-	FSL_QUADSPI_IMX6SX,
>-	FSL_QUADSPI_IMX6UL_7D,
>-	FSL_QUADSPI_IMX7ULP,
>-};
>+/* Controller needs 4x internal clock */
>+#define QUADSPI_QUIRK_4X_INT_CLK	BIT(1)
>
>-struct fsl_qspi_devtype_data {
>-	enum fsl_qspi_devtype devtype;
>-	u32 rxfifo;
>-	u32 txfifo;
>-	u32 ahb_buf_size;
>-	u32 driver_data;
>-};
>+/*
>+ * TKT253890, the controller needs the driver to fill the txfifo with
>+ * 16 bytes at least to trigger a data transfer, even though the extra
>+ * data won't be transferred.
>+ */
>+#define QUADSPI_QUIRK_TKT253890		BIT(2)
>
>-/**
>- * struct fsl_qspi_platdata - platform data for Freescale QSPI
>- *
>- * @flags: Flags for QSPI QSPI_FLAG_...
>- * @speed_hz: Default SCK frequency
>- * @reg_base: Base address of QSPI registers
>- * @amba_base: Base address of QSPI memory mapping
>- * @amba_total_size: size of QSPI memory mapping
>- * @flash_num: Number of active slave devices
>- * @num_chipselect: Number of QSPI chipselect signals
>+/* TKT245618, the controller cannot wake up from wait mode */
>+#define QUADSPI_QUIRK_TKT245618		BIT(3)
>+
>+/*
>+ * Controller adds QSPI_AMBA_BASE (base address of the mapped memory)
>+ * internally. No need to add it when setting SFXXAD and SFAR registers
>  */
>-struct fsl_qspi_platdata {
>-	u32 flags;
>-	u32 speed_hz;
>-	fdt_addr_t reg_base;
>-	fdt_addr_t amba_base;
>-	fdt_size_t amba_total_size;
>-	u32 flash_num;
>-	u32 num_chipselect;
>-};
>+#define QUADSPI_QUIRK_BASE_INTERNAL	BIT(4)
>
>-/**
>- * struct fsl_qspi_priv - private data for Freescale QSPI
>- *
>- * @flags: Flags for QSPI QSPI_FLAG_...
>- * @bus_clk: QSPI input clk frequency
>- * @speed_hz: Default SCK frequency
>- * @cur_seqid: current LUT table sequence id
>- * @sf_addr: flash access offset
>- * @amba_base: Base address of QSPI memory mapping of every CS
>- * @amba_total_size: size of QSPI memory mapping
>- * @cur_amba_base: Base address of QSPI memory mapping of current CS
>- * @flash_num: Number of active slave devices
>- * @num_chipselect: Number of QSPI chipselect signals
>- * @regs: Point to QSPI register structure for I/O access
>+/*
>+ * Controller uses TDH bits in register QUADSPI_FLSHCR.
>+ * They need to be set in accordance with the DDR/SDR mode.
>  */
>-struct fsl_qspi_priv {
>-	u32 flags;
>-	u32 bus_clk;
>-	u32 speed_hz;
>-	u32 cur_seqid;
>-	u32 sf_addr;
>-	u32 amba_base[FSL_QSPI_MAX_CHIPSELECT_NUM];
>-	u32 amba_total_size;
>-	u32 cur_amba_base;
>-	u32 flash_num;
>-	u32 num_chipselect;
>-	struct fsl_qspi_regs *regs;
>-	struct fsl_qspi_devtype_data *devtype_data;
>+#define QUADSPI_QUIRK_USE_TDH_SETTING	BIT(5)
>+
>+struct fsl_qspi_devtype_data {
>+	unsigned int rxfifo;
>+	unsigned int txfifo;
>+	unsigned int ahb_buf_size;
>+	unsigned int quirks;
>+	bool little_endian;
> };
>
> static const struct fsl_qspi_devtype_data vybrid_data = {
>-	.devtype = FSL_QUADSPI_VYBRID,
>-	.rxfifo = 128,
>-	.txfifo = 64,
>-	.ahb_buf_size = 1024,
>-	.driver_data = QUADSPI_QUIRK_SWAP_ENDIAN,
>+	.rxfifo = SZ_128,
>+	.txfifo = SZ_64,
>+	.ahb_buf_size = SZ_1K,
>+	.quirks = QUADSPI_QUIRK_SWAP_ENDIAN,
>+	.little_endian = true,
> };
>
> static const struct fsl_qspi_devtype_data imx6sx_data = {
>-	.devtype = FSL_QUADSPI_IMX6SX,
>-	.rxfifo = 128,
>-	.txfifo = 512,
>-	.ahb_buf_size = 1024,
>-	.driver_data = 0,
>+	.rxfifo = SZ_128,
>+	.txfifo = SZ_512,
>+	.ahb_buf_size = SZ_1K,
>+	.quirks = QUADSPI_QUIRK_4X_INT_CLK | QUADSPI_QUIRK_TKT245618,
>+	.little_endian = true,
>+};
>+
>+static const struct fsl_qspi_devtype_data imx7d_data = {
>+	.rxfifo = SZ_128,
>+	.txfifo = SZ_512,
>+	.ahb_buf_size = SZ_1K,
>+	.quirks = QUADSPI_QUIRK_TKT253890 | QUADSPI_QUIRK_4X_INT_CLK |
>+		  QUADSPI_QUIRK_USE_TDH_SETTING,
>+	.little_endian = true,
>+};
>+
>+static const struct fsl_qspi_devtype_data imx6ul_data = {
>+	.rxfifo = SZ_128,
>+	.txfifo = SZ_512,
>+	.ahb_buf_size = SZ_1K,
>+	.quirks = QUADSPI_QUIRK_TKT253890 | QUADSPI_QUIRK_4X_INT_CLK |
>+		  QUADSPI_QUIRK_USE_TDH_SETTING,
>+	.little_endian = true,
> };
>
>-static const struct fsl_qspi_devtype_data imx6ul_7d_data = {
>-	.devtype = FSL_QUADSPI_IMX6UL_7D,
>-	.rxfifo = 128,
>-	.txfifo = 512,
>-	.ahb_buf_size = 1024,
>-	.driver_data = 0,
>+static const struct fsl_qspi_devtype_data ls1021a_data = {
>+	.rxfifo = SZ_128,
>+	.txfifo = SZ_64,
>+	.ahb_buf_size = SZ_1K,
>+	.quirks = 0,
>+	.little_endian = false,
> };
>
>-static const struct fsl_qspi_devtype_data imx7ulp_data = {
>-	.devtype = FSL_QUADSPI_IMX7ULP,
>-	.rxfifo = 64,
>-	.txfifo = 64,
>-	.ahb_buf_size = 128,
>-	.driver_data = 0,
>+static const struct fsl_qspi_devtype_data ls1088a_data = {
>+	.rxfifo = SZ_128,
>+	.txfifo = SZ_128,
>+	.ahb_buf_size = SZ_1K,
>+	.quirks = QUADSPI_QUIRK_TKT253890,
>+	.little_endian = true,
> };
>
>-static u32 qspi_read32(u32 flags, u32 *addr)
>+static const struct fsl_qspi_devtype_data ls2080a_data = {
>+	.rxfifo = SZ_128,
>+	.txfifo = SZ_64,
>+	.ahb_buf_size = SZ_1K,
>+	.quirks = QUADSPI_QUIRK_TKT253890 |
>QUADSPI_QUIRK_BASE_INTERNAL,
>+	.little_endian = true,
>+};
>+
>+struct fsl_qspi {
>+	void __iomem *iobase;
>+	void __iomem *ahb_addr;
>+	u32 memmap_phy;
>+	const struct fsl_qspi_devtype_data *devtype_data;
>+	int selected;
>+};
>+
It would be better to move all declarations to header file. 
<snip>
-Priyanka

[Patch v2 1/7] spi: Transform the FSL QuadSPI driver to use the SPI MEM API

[Kuldeep Singh]

Hi Priyanka,

> -----Original Message-----
> From: Priyanka Jain <priyanka.jain@nxp.com>
> Sent: Tuesday, December 17, 2019 10:38 AM
> To: Kuldeep Singh <kuldeep.singh@nxp.com>; u-boot at lists.denx.de
> Cc: jagan at amarulasolutions.com; sr at denx.de; Ashish Kumar
> <ashish.kumar@nxp.com>; frieder.schrempf at kontron.de; Kuldeep Singh
> <kuldeep.singh@nxp.com>; Ashish Kumar <ashish.kumar@nxp.com>
> Subject: RE: [Patch v2 1/7] spi: Transform the FSL QuadSPI driver to use the SPI
> MEM API
> 
> 
> 
> >-----Original Message-----
> >From: Kuldeep Singh <kuldeep.singh@nxp.com>
> >Sent: Monday, December 16, 2019 5:19 PM
> >To: u-boot at lists.denx.de
> >Cc: jagan at amarulasolutions.com; Priyanka Jain <priyanka.jain@nxp.com>;
> >sr at denx.de; Ashish Kumar <ashish.kumar@nxp.com>;
> >frieder.schrempf at kontron.de; Kuldeep Singh <kuldeep.singh@nxp.com>;
> >Ashish Kumar <ashish.kumar@nxp.com>
> >Subject: [Patch v2 1/7] spi: Transform the FSL QuadSPI driver to use
> >the SPI MEM API
> >
> >To support the SPI MEM API, instead of modifying the existing U-Boot
> >driver, this patch adds a port of the existing Linux driver.
> >This also has the advantage that porting changes and fixes from Linux
> >will be easier.
> >Porting of driver left most of the functions unchanged while few of the
> >changes are:
> >-Remove lock(mutexes) and irq handler as uboot is a single core execution.
> >-Remove clock support as the changing spi speed is not supported in
> >uboot and nor in linux.
> >
> >Currently tested on LS1088ARDB, LS1012ARDB, LS1046ARDB, LS1046AFRWY,
> >LS1043AQDS, LS1021ATWR, LS2080ARDB
> >
> >Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de>
> >Signed-off-by: Ashish Kumar <Ashish.Kumar@nxp.com>
> >Signed-off-by: Kuldeep Singh <kuldeep.singh@nxp.com>
> >---
> > drivers/spi/fsl_qspi.c | 1562 +++++++++++++++-------------------------
> > drivers/spi/fsl_qspi.h |  145 ----
> > 2 files changed, 593 insertions(+), 1114 deletions(-)  delete mode
> >100644 drivers/spi/fsl_qspi.h
> >
> >diff --git a/drivers/spi/fsl_qspi.c b/drivers/spi/fsl_qspi.c index
> >8e2a09df36..96178c06bc 100644
> >--- a/drivers/spi/fsl_qspi.c
> >+++ b/drivers/spi/fsl_qspi.c
> >@@ -1,1142 +1,766 @@
> > // SPDX-License-Identifier: GPL-2.0+
> >+
> > /*
> >- * Copyright 2013-2015 Freescale Semiconductor, Inc.
> >+ * Freescale QuadSPI driver.
> >+ *
> >+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
> >+ * Copyright (C) 2018 Bootlin
> >+ * Copyright (C) 2018 exceet electronics GmbH
> >+ * Copyright (C) 2018 Kontron Electronics GmbH
> >+ * Copyright (C) 2019-2020 NXP
> Please check copyright format
> It seems the changes have been brought from Linux driver.
> If yes, it would be good to mention that in File header

Ok. I will mention that information on top.

> >  *
> >- * Freescale Quad Serial Peripheral Interface (QSPI) driver
> >+ * Based on the original fsl-quadspi.c spi-nor driver.
> >+ * Transition to spi-mem in spi-fsl-qspi.c
> >  */
> >
> > #include <common.h>
> >-#include <malloc.h>
> >-#include <spi.h>
> > #include <asm/io.h>
> >-#include <linux/sizes.h>
> >-#include <linux/iopoll.h>
> > #include <dm.h>
> >-#include <errno.h>
> >-#include <watchdog.h>
> >-#include <wait_bit.h>
> >-#include "fsl_qspi.h"
> >+#include <linux/iopoll.h>
> >+#include <linux/sizes.h>
> >+#include <spi.h>
> >+#include <spi-mem.h>
> >
> > DECLARE_GLOBAL_DATA_PTR;
> >
> >-#define OFFSET_BITS_MASK	GENMASK(23, 0)
> >-
> >-#define FLASH_STATUS_WEL	0x02
> >-
> >-/* SEQID */
> >-#define SEQID_WREN		1
> >-#define SEQID_FAST_READ		2
> >-#define SEQID_RDSR		3
> >-#define SEQID_SE		4
> >-#define SEQID_CHIP_ERASE	5
> >-#define SEQID_PP		6
> >-#define SEQID_RDID		7
> >-#define SEQID_BE_4K		8
> >-#ifdef CONFIG_SPI_FLASH_BAR
> >-#define SEQID_BRRD		9
> >-#define SEQID_BRWR		10
> >-#define SEQID_RDEAR		11
> >-#define SEQID_WREAR		12
> >-#endif
> >-#define SEQID_WRAR		13
> >-#define SEQID_RDAR		14
> >-
> >-/* QSPI CMD */
> >-#define QSPI_CMD_PP		0x02	/* Page program (up to 256
> bytes) */
> >-#define QSPI_CMD_RDSR		0x05	/* Read status register */
> >-#define QSPI_CMD_WREN		0x06	/* Write enable */
> >-#define QSPI_CMD_FAST_READ	0x0b	/* Read data bytes (high
> >frequency) */
> >-#define QSPI_CMD_BE_4K		0x20    /* 4K erase */
> >-#define QSPI_CMD_CHIP_ERASE	0xc7	/* Erase whole flash chip */
> >-#define QSPI_CMD_SE		0xd8	/* Sector erase (usually 64KiB)
> */
> >-#define QSPI_CMD_RDID		0x9f	/* Read JEDEC ID */
> >-
> >-/* Used for Micron, winbond and Macronix flashes */
> >-#define	QSPI_CMD_WREAR		0xc5	/* EAR register write
> */
> >-#define	QSPI_CMD_RDEAR		0xc8	/* EAR reigster read
> */
> >-
> >-/* Used for Spansion flashes only. */
> >-#define	QSPI_CMD_BRRD		0x16	/* Bank register read
> >*/
> >-#define	QSPI_CMD_BRWR		0x17	/* Bank register
> write
> >*/
> >-
> >-/* Used for Spansion S25FS-S family flash only. */
> >-#define QSPI_CMD_RDAR		0x65	/* Read any device register
> */
> >-#define QSPI_CMD_WRAR		0x71	/* Write any device register
> */
> >-
> >-/* 4-byte address QSPI CMD - used on Spansion and some Macronix flashes
> */
> >-#define QSPI_CMD_FAST_READ_4B	0x0c    /* Read data bytes (high
> >frequency) */
> >-#define QSPI_CMD_PP_4B		0x12    /* Page program (up to 256
> >bytes) */
> >-#define QSPI_CMD_SE_4B		0xdc    /* Sector erase (usually 64KiB)
> >*/
> >-
> >-/* fsl_qspi_platdata flags */
> >-#define QSPI_FLAG_REGMAP_ENDIAN_BIG	BIT(0)
> >-
> >-/* default SCK frequency, unit: HZ */
> >-#define FSL_QSPI_DEFAULT_SCK_FREQ	50000000
> >-
> >-/* QSPI max chipselect signals number */
> >-#define FSL_QSPI_MAX_CHIPSELECT_NUM     4
> >-
> >-/* Controller needs driver to swap endian */
> >+/*
> >+ * The driver only uses one single LUT entry, that is updated on
> >+ * each call of exec_op(). Index 0 is preset at boot with a basic
> >+ * read operation, so let's use the last entry (15).
> >+ */
> >+#define	SEQID_LUT			15
> >+
> >+/* Registers used by the driver */
> >+#define QUADSPI_MCR			0x00
> >+#define QUADSPI_MCR_RESERVED_MASK	GENMASK(19, 16)
> >+#define QUADSPI_MCR_MDIS_MASK		BIT(14)
> >+#define QUADSPI_MCR_CLR_TXF_MASK	BIT(11)
> >+#define QUADSPI_MCR_CLR_RXF_MASK	BIT(10)
> >+#define QUADSPI_MCR_DDR_EN_MASK		BIT(7)
> >+#define QUADSPI_MCR_END_CFG_MASK	GENMASK(3, 2)
> >+#define QUADSPI_MCR_SWRSTHD_MASK	BIT(1)
> >+#define QUADSPI_MCR_SWRSTSD_MASK	BIT(0)
> >+
> >+#define QUADSPI_IPCR			0x08
> >+#define QUADSPI_IPCR_SEQID(x)		((x) << 24)
> >+#define QUADSPI_FLSHCR			0x0c
> >+#define QUADSPI_FLSHCR_TCSS_MASK	GENMASK(3, 0)
> >+#define QUADSPI_FLSHCR_TCSH_MASK	GENMASK(11, 8)
> >+#define QUADSPI_FLSHCR_TDH_MASK		GENMASK(17, 16)
> >+
> >+#define QUADSPI_BUF3CR			0x1c
> >+#define QUADSPI_BUF3CR_ALLMST_MASK	BIT(31)
> >+#define QUADSPI_BUF3CR_ADATSZ(x)	((x) << 8)
> >+#define QUADSPI_BUF3CR_ADATSZ_MASK	GENMASK(15, 8)
> >+
> >+#define QUADSPI_BFGENCR			0x20
> >+#define QUADSPI_BFGENCR_SEQID(x)	((x) << 12)
> >+
> >+#define QUADSPI_BUF0IND			0x30
> >+#define QUADSPI_BUF1IND			0x34
> >+#define QUADSPI_BUF2IND			0x38
> >+#define QUADSPI_SFAR			0x100
> >+
> >+#define QUADSPI_SMPR			0x108
> >+#define QUADSPI_SMPR_DDRSMP_MASK	GENMASK(18, 16)
> >+#define QUADSPI_SMPR_FSDLY_MASK		BIT(6)
> >+#define QUADSPI_SMPR_FSPHS_MASK		BIT(5)
> >+#define QUADSPI_SMPR_HSENA_MASK		BIT(0)
> >+
> >+#define QUADSPI_RBCT			0x110
> >+#define QUADSPI_RBCT_WMRK_MASK		GENMASK(4, 0)
> >+#define QUADSPI_RBCT_RXBRD_USEIPS	BIT(8)
> >+
> >+#define QUADSPI_TBDR			0x154
> >+
> >+#define QUADSPI_SR			0x15c
> >+#define QUADSPI_SR_IP_ACC_MASK		BIT(1)
> >+#define QUADSPI_SR_AHB_ACC_MASK		BIT(2)
> >+
> >+#define QUADSPI_FR			0x160
> >+#define QUADSPI_FR_TFF_MASK		BIT(0)
> >+
> >+#define QUADSPI_RSER			0x164
> >+#define QUADSPI_RSER_TFIE		BIT(0)
> >+
> >+#define QUADSPI_SPTRCLR			0x16c
> >+#define QUADSPI_SPTRCLR_IPPTRC		BIT(8)
> >+#define QUADSPI_SPTRCLR_BFPTRC		BIT(0)
> >+
> >+#define QUADSPI_SFA1AD			0x180
> >+#define QUADSPI_SFA2AD			0x184
> >+#define QUADSPI_SFB1AD			0x188
> >+#define QUADSPI_SFB2AD			0x18c
> >+#define QUADSPI_RBDR(x)			(0x200 + ((x) * 4))
> >+
> >+#define QUADSPI_LUTKEY			0x300
> >+#define QUADSPI_LUTKEY_VALUE		0x5AF05AF0
> >+
> >+#define QUADSPI_LCKCR			0x304
> >+#define QUADSPI_LCKER_LOCK		BIT(0)
> >+#define QUADSPI_LCKER_UNLOCK		BIT(1)
> >+
> >+#define QUADSPI_LUT_BASE		0x310
> >+#define QUADSPI_LUT_OFFSET		(SEQID_LUT * 4 * 4)
> >+#define QUADSPI_LUT_REG(idx) \
> >+	(QUADSPI_LUT_BASE + QUADSPI_LUT_OFFSET + (idx) * 4)
> >+
> >+/* Instruction set for the LUT register */
> >+#define LUT_STOP		0
> >+#define LUT_CMD			1
> >+#define LUT_ADDR		2
> >+#define LUT_DUMMY		3
> >+#define LUT_MODE		4
> >+#define LUT_MODE2		5
> >+#define LUT_MODE4		6
> >+#define LUT_FSL_READ		7
> >+#define LUT_FSL_WRITE		8
> >+#define LUT_JMP_ON_CS		9
> >+#define LUT_ADDR_DDR		10
> >+#define LUT_MODE_DDR		11
> >+#define LUT_MODE2_DDR		12
> >+#define LUT_MODE4_DDR		13
> >+#define LUT_FSL_READ_DDR	14
> >+#define LUT_FSL_WRITE_DDR	15
> >+#define LUT_DATA_LEARN		16
> >+
> >+/*
> >+ * The PAD definitions for LUT register.
> >+ *
> >+ * The pad stands for the number of IO lines [0:3].
> >+ * For example, the quad read needs four IO lines,
> >+ * so you should use LUT_PAD(4).
> >+ */
> >+#define LUT_PAD(x) (fls(x) - 1)
> >+
> >+/*
> >+ * Macro for constructing the LUT entries with the following
> >+ * register layout:
> >+ *
> >+ *  ---------------------------------------------------
> >+ *  | INSTR1 | PAD1 | OPRND1 | INSTR0 | PAD0 | OPRND0 |
> >+ *  ---------------------------------------------------
> >+ */
> >+#define LUT_DEF(idx, ins, pad, opr)					\
> >+	((((ins) << 10) | ((pad) << 8) | (opr)) << (((idx) % 2) * 16))
> >+
> >+/* Controller needs driver to swap endianness */
> > #define QUADSPI_QUIRK_SWAP_ENDIAN	BIT(0)
> >
> >-enum fsl_qspi_devtype {
> >-	FSL_QUADSPI_VYBRID,
> >-	FSL_QUADSPI_IMX6SX,
> >-	FSL_QUADSPI_IMX6UL_7D,
> >-	FSL_QUADSPI_IMX7ULP,
> >-};
> >+/* Controller needs 4x internal clock */
> >+#define QUADSPI_QUIRK_4X_INT_CLK	BIT(1)
> >
> >-struct fsl_qspi_devtype_data {
> >-	enum fsl_qspi_devtype devtype;
> >-	u32 rxfifo;
> >-	u32 txfifo;
> >-	u32 ahb_buf_size;
> >-	u32 driver_data;
> >-};
> >+/*
> >+ * TKT253890, the controller needs the driver to fill the txfifo with
> >+ * 16 bytes at least to trigger a data transfer, even though the extra
> >+ * data won't be transferred.
> >+ */
> >+#define QUADSPI_QUIRK_TKT253890		BIT(2)
> >
> >-/**
> >- * struct fsl_qspi_platdata - platform data for Freescale QSPI
> >- *
> >- * @flags: Flags for QSPI QSPI_FLAG_...
> >- * @speed_hz: Default SCK frequency
> >- * @reg_base: Base address of QSPI registers
> >- * @amba_base: Base address of QSPI memory mapping
> >- * @amba_total_size: size of QSPI memory mapping
> >- * @flash_num: Number of active slave devices
> >- * @num_chipselect: Number of QSPI chipselect signals
> >+/* TKT245618, the controller cannot wake up from wait mode */
> >+#define QUADSPI_QUIRK_TKT245618		BIT(3)
> >+
> >+/*
> >+ * Controller adds QSPI_AMBA_BASE (base address of the mapped memory)
> >+ * internally. No need to add it when setting SFXXAD and SFAR
> >+registers
> >  */
> >-struct fsl_qspi_platdata {
> >-	u32 flags;
> >-	u32 speed_hz;
> >-	fdt_addr_t reg_base;
> >-	fdt_addr_t amba_base;
> >-	fdt_size_t amba_total_size;
> >-	u32 flash_num;
> >-	u32 num_chipselect;
> >-};
> >+#define QUADSPI_QUIRK_BASE_INTERNAL	BIT(4)
> >
> >-/**
> >- * struct fsl_qspi_priv - private data for Freescale QSPI
> >- *
> >- * @flags: Flags for QSPI QSPI_FLAG_...
> >- * @bus_clk: QSPI input clk frequency
> >- * @speed_hz: Default SCK frequency
> >- * @cur_seqid: current LUT table sequence id
> >- * @sf_addr: flash access offset
> >- * @amba_base: Base address of QSPI memory mapping of every CS
> >- * @amba_total_size: size of QSPI memory mapping
> >- * @cur_amba_base: Base address of QSPI memory mapping of current CS
> >- * @flash_num: Number of active slave devices
> >- * @num_chipselect: Number of QSPI chipselect signals
> >- * @regs: Point to QSPI register structure for I/O access
> >+/*
> >+ * Controller uses TDH bits in register QUADSPI_FLSHCR.
> >+ * They need to be set in accordance with the DDR/SDR mode.
> >  */
> >-struct fsl_qspi_priv {
> >-	u32 flags;
> >-	u32 bus_clk;
> >-	u32 speed_hz;
> >-	u32 cur_seqid;
> >-	u32 sf_addr;
> >-	u32 amba_base[FSL_QSPI_MAX_CHIPSELECT_NUM];
> >-	u32 amba_total_size;
> >-	u32 cur_amba_base;
> >-	u32 flash_num;
> >-	u32 num_chipselect;
> >-	struct fsl_qspi_regs *regs;
> >-	struct fsl_qspi_devtype_data *devtype_data;
> >+#define QUADSPI_QUIRK_USE_TDH_SETTING	BIT(5)
> >+
> >+struct fsl_qspi_devtype_data {
> >+	unsigned int rxfifo;
> >+	unsigned int txfifo;
> >+	unsigned int ahb_buf_size;
> >+	unsigned int quirks;
> >+	bool little_endian;
> > };
> >
> > static const struct fsl_qspi_devtype_data vybrid_data = {
> >-	.devtype = FSL_QUADSPI_VYBRID,
> >-	.rxfifo = 128,
> >-	.txfifo = 64,
> >-	.ahb_buf_size = 1024,
> >-	.driver_data = QUADSPI_QUIRK_SWAP_ENDIAN,
> >+	.rxfifo = SZ_128,
> >+	.txfifo = SZ_64,
> >+	.ahb_buf_size = SZ_1K,
> >+	.quirks = QUADSPI_QUIRK_SWAP_ENDIAN,
> >+	.little_endian = true,
> > };
> >
> > static const struct fsl_qspi_devtype_data imx6sx_data = {
> >-	.devtype = FSL_QUADSPI_IMX6SX,
> >-	.rxfifo = 128,
> >-	.txfifo = 512,
> >-	.ahb_buf_size = 1024,
> >-	.driver_data = 0,
> >+	.rxfifo = SZ_128,
> >+	.txfifo = SZ_512,
> >+	.ahb_buf_size = SZ_1K,
> >+	.quirks = QUADSPI_QUIRK_4X_INT_CLK | QUADSPI_QUIRK_TKT245618,
> >+	.little_endian = true,
> >+};
> >+
> >+static const struct fsl_qspi_devtype_data imx7d_data = {
> >+	.rxfifo = SZ_128,
> >+	.txfifo = SZ_512,
> >+	.ahb_buf_size = SZ_1K,
> >+	.quirks = QUADSPI_QUIRK_TKT253890 | QUADSPI_QUIRK_4X_INT_CLK
> |
> >+		  QUADSPI_QUIRK_USE_TDH_SETTING,
> >+	.little_endian = true,
> >+};
> >+
> >+static const struct fsl_qspi_devtype_data imx6ul_data = {
> >+	.rxfifo = SZ_128,
> >+	.txfifo = SZ_512,
> >+	.ahb_buf_size = SZ_1K,
> >+	.quirks = QUADSPI_QUIRK_TKT253890 | QUADSPI_QUIRK_4X_INT_CLK
> |
> >+		  QUADSPI_QUIRK_USE_TDH_SETTING,
> >+	.little_endian = true,
> > };
> >
> >-static const struct fsl_qspi_devtype_data imx6ul_7d_data = {
> >-	.devtype = FSL_QUADSPI_IMX6UL_7D,
> >-	.rxfifo = 128,
> >-	.txfifo = 512,
> >-	.ahb_buf_size = 1024,
> >-	.driver_data = 0,
> >+static const struct fsl_qspi_devtype_data ls1021a_data = {
> >+	.rxfifo = SZ_128,
> >+	.txfifo = SZ_64,
> >+	.ahb_buf_size = SZ_1K,
> >+	.quirks = 0,
> >+	.little_endian = false,
> > };
> >
> >-static const struct fsl_qspi_devtype_data imx7ulp_data = {
> >-	.devtype = FSL_QUADSPI_IMX7ULP,
> >-	.rxfifo = 64,
> >-	.txfifo = 64,
> >-	.ahb_buf_size = 128,
> >-	.driver_data = 0,
> >+static const struct fsl_qspi_devtype_data ls1088a_data = {
> >+	.rxfifo = SZ_128,
> >+	.txfifo = SZ_128,
> >+	.ahb_buf_size = SZ_1K,
> >+	.quirks = QUADSPI_QUIRK_TKT253890,
> >+	.little_endian = true,
> > };
> >
> >-static u32 qspi_read32(u32 flags, u32 *addr)
> >+static const struct fsl_qspi_devtype_data ls2080a_data = {
> >+	.rxfifo = SZ_128,
> >+	.txfifo = SZ_64,
> >+	.ahb_buf_size = SZ_1K,
> >+	.quirks = QUADSPI_QUIRK_TKT253890 |
> >QUADSPI_QUIRK_BASE_INTERNAL,
> >+	.little_endian = true,
> >+};
> >+
> >+struct fsl_qspi {
> >+	void __iomem *iobase;
> >+	void __iomem *ahb_addr;
> >+	u32 memmap_phy;
> >+	const struct fsl_qspi_devtype_data *devtype_data;
> >+	int selected;
> >+};
> >+
> It would be better to move all declarations to header file.

Current Linux driver has declarations in the same file and that's why the same idea was applied to u-boot as well.

Thanks
Kuldeep

> <snip>
> -Priyanka

[Patch v2 1/7] spi: Transform the FSL QuadSPI driver to use the SPI MEM API

[Stefan Roese]

On 16.12.19 12:49, Kuldeep Singh wrote:
> To support the SPI MEM API, instead of modifying the existing U-Boot
> driver, this patch adds a port of the existing Linux driver.
> This also has the advantage that porting changes and fixes from Linux
> will be easier.
> Porting of driver left most of the functions unchanged while few of the
> changes are:
> -Remove lock(mutexes) and irq handler as uboot is a single core execution.
> -Remove clock support as the changing spi speed is not supported in
> uboot and nor in linux.
> 
> Currently tested on LS1088ARDB, LS1012ARDB, LS1046ARDB, LS1046AFRWY,
> LS1043AQDS, LS1021ATWR, LS2080ARDB
> 
> Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de>
> Signed-off-by: Ashish Kumar <Ashish.Kumar@nxp.com>
> Signed-off-by: Kuldeep Singh <kuldeep.singh@nxp.com>

Reviewed-by: Stefan Roese <sr@denx.de>
Tested-by: Stefan Roese <sr@denx.de>

Tested on the NXP i.MX6ULL EVK.

Thanks,
Stefan

> ---
>   drivers/spi/fsl_qspi.c | 1562 +++++++++++++++-------------------------
>   drivers/spi/fsl_qspi.h |  145 ----
>   2 files changed, 593 insertions(+), 1114 deletions(-)
>   delete mode 100644 drivers/spi/fsl_qspi.h
> 
> diff --git a/drivers/spi/fsl_qspi.c b/drivers/spi/fsl_qspi.c
> index 8e2a09df36..96178c06bc 100644
> --- a/drivers/spi/fsl_qspi.c
> +++ b/drivers/spi/fsl_qspi.c
> @@ -1,1142 +1,766 @@
>   // SPDX-License-Identifier: GPL-2.0+
> +
>   /*
> - * Copyright 2013-2015 Freescale Semiconductor, Inc.
> + * Freescale QuadSPI driver.
> + *
> + * Copyright (C) 2013 Freescale Semiconductor, Inc.
> + * Copyright (C) 2018 Bootlin
> + * Copyright (C) 2018 exceet electronics GmbH
> + * Copyright (C) 2018 Kontron Electronics GmbH
> + * Copyright (C) 2019-2020 NXP
>    *
> - * Freescale Quad Serial Peripheral Interface (QSPI) driver
> + * Based on the original fsl-quadspi.c spi-nor driver.
> + * Transition to spi-mem in spi-fsl-qspi.c
>    */
>   
>   #include <common.h>
> -#include <malloc.h>
> -#include <spi.h>
>   #include <asm/io.h>
> -#include <linux/sizes.h>
> -#include <linux/iopoll.h>
>   #include <dm.h>
> -#include <errno.h>
> -#include <watchdog.h>
> -#include <wait_bit.h>
> -#include "fsl_qspi.h"
> +#include <linux/iopoll.h>
> +#include <linux/sizes.h>
> +#include <spi.h>
> +#include <spi-mem.h>
>   
>   DECLARE_GLOBAL_DATA_PTR;
>   
> -#define OFFSET_BITS_MASK	GENMASK(23, 0)
> -
> -#define FLASH_STATUS_WEL	0x02
> -
> -/* SEQID */
> -#define SEQID_WREN		1
> -#define SEQID_FAST_READ		2
> -#define SEQID_RDSR		3
> -#define SEQID_SE		4
> -#define SEQID_CHIP_ERASE	5
> -#define SEQID_PP		6
> -#define SEQID_RDID		7
> -#define SEQID_BE_4K		8
> -#ifdef CONFIG_SPI_FLASH_BAR
> -#define SEQID_BRRD		9
> -#define SEQID_BRWR		10
> -#define SEQID_RDEAR		11
> -#define SEQID_WREAR		12
> -#endif
> -#define SEQID_WRAR		13
> -#define SEQID_RDAR		14
> -
> -/* QSPI CMD */
> -#define QSPI_CMD_PP		0x02	/* Page program (up to 256 bytes) */
> -#define QSPI_CMD_RDSR		0x05	/* Read status register */
> -#define QSPI_CMD_WREN		0x06	/* Write enable */
> -#define QSPI_CMD_FAST_READ	0x0b	/* Read data bytes (high frequency) */
> -#define QSPI_CMD_BE_4K		0x20    /* 4K erase */
> -#define QSPI_CMD_CHIP_ERASE	0xc7	/* Erase whole flash chip */
> -#define QSPI_CMD_SE		0xd8	/* Sector erase (usually 64KiB) */
> -#define QSPI_CMD_RDID		0x9f	/* Read JEDEC ID */
> -
> -/* Used for Micron, winbond and Macronix flashes */
> -#define	QSPI_CMD_WREAR		0xc5	/* EAR register write */
> -#define	QSPI_CMD_RDEAR		0xc8	/* EAR reigster read */
> -
> -/* Used for Spansion flashes only. */
> -#define	QSPI_CMD_BRRD		0x16	/* Bank register read */
> -#define	QSPI_CMD_BRWR		0x17	/* Bank register write */
> -
> -/* Used for Spansion S25FS-S family flash only. */
> -#define QSPI_CMD_RDAR		0x65	/* Read any device register */
> -#define QSPI_CMD_WRAR		0x71	/* Write any device register */
> -
> -/* 4-byte address QSPI CMD - used on Spansion and some Macronix flashes */
> -#define QSPI_CMD_FAST_READ_4B	0x0c    /* Read data bytes (high frequency) */
> -#define QSPI_CMD_PP_4B		0x12    /* Page program (up to 256 bytes) */
> -#define QSPI_CMD_SE_4B		0xdc    /* Sector erase (usually 64KiB) */
> -
> -/* fsl_qspi_platdata flags */
> -#define QSPI_FLAG_REGMAP_ENDIAN_BIG	BIT(0)
> -
> -/* default SCK frequency, unit: HZ */
> -#define FSL_QSPI_DEFAULT_SCK_FREQ	50000000
> -
> -/* QSPI max chipselect signals number */
> -#define FSL_QSPI_MAX_CHIPSELECT_NUM     4
> -
> -/* Controller needs driver to swap endian */
> +/*
> + * The driver only uses one single LUT entry, that is updated on
> + * each call of exec_op(). Index 0 is preset at boot with a basic
> + * read operation, so let's use the last entry (15).
> + */
> +#define	SEQID_LUT			15
> +
> +/* Registers used by the driver */
> +#define QUADSPI_MCR			0x00
> +#define QUADSPI_MCR_RESERVED_MASK	GENMASK(19, 16)
> +#define QUADSPI_MCR_MDIS_MASK		BIT(14)
> +#define QUADSPI_MCR_CLR_TXF_MASK	BIT(11)
> +#define QUADSPI_MCR_CLR_RXF_MASK	BIT(10)
> +#define QUADSPI_MCR_DDR_EN_MASK		BIT(7)
> +#define QUADSPI_MCR_END_CFG_MASK	GENMASK(3, 2)
> +#define QUADSPI_MCR_SWRSTHD_MASK	BIT(1)
> +#define QUADSPI_MCR_SWRSTSD_MASK	BIT(0)
> +
> +#define QUADSPI_IPCR			0x08
> +#define QUADSPI_IPCR_SEQID(x)		((x) << 24)
> +#define QUADSPI_FLSHCR			0x0c
> +#define QUADSPI_FLSHCR_TCSS_MASK	GENMASK(3, 0)
> +#define QUADSPI_FLSHCR_TCSH_MASK	GENMASK(11, 8)
> +#define QUADSPI_FLSHCR_TDH_MASK		GENMASK(17, 16)
> +
> +#define QUADSPI_BUF3CR			0x1c
> +#define QUADSPI_BUF3CR_ALLMST_MASK	BIT(31)
> +#define QUADSPI_BUF3CR_ADATSZ(x)	((x) << 8)
> +#define QUADSPI_BUF3CR_ADATSZ_MASK	GENMASK(15, 8)
> +
> +#define QUADSPI_BFGENCR			0x20
> +#define QUADSPI_BFGENCR_SEQID(x)	((x) << 12)
> +
> +#define QUADSPI_BUF0IND			0x30
> +#define QUADSPI_BUF1IND			0x34
> +#define QUADSPI_BUF2IND			0x38
> +#define QUADSPI_SFAR			0x100
> +
> +#define QUADSPI_SMPR			0x108
> +#define QUADSPI_SMPR_DDRSMP_MASK	GENMASK(18, 16)
> +#define QUADSPI_SMPR_FSDLY_MASK		BIT(6)
> +#define QUADSPI_SMPR_FSPHS_MASK		BIT(5)
> +#define QUADSPI_SMPR_HSENA_MASK		BIT(0)
> +
> +#define QUADSPI_RBCT			0x110
> +#define QUADSPI_RBCT_WMRK_MASK		GENMASK(4, 0)
> +#define QUADSPI_RBCT_RXBRD_USEIPS	BIT(8)
> +
> +#define QUADSPI_TBDR			0x154
> +
> +#define QUADSPI_SR			0x15c
> +#define QUADSPI_SR_IP_ACC_MASK		BIT(1)
> +#define QUADSPI_SR_AHB_ACC_MASK		BIT(2)
> +
> +#define QUADSPI_FR			0x160
> +#define QUADSPI_FR_TFF_MASK		BIT(0)
> +
> +#define QUADSPI_RSER			0x164
> +#define QUADSPI_RSER_TFIE		BIT(0)
> +
> +#define QUADSPI_SPTRCLR			0x16c
> +#define QUADSPI_SPTRCLR_IPPTRC		BIT(8)
> +#define QUADSPI_SPTRCLR_BFPTRC		BIT(0)
> +
> +#define QUADSPI_SFA1AD			0x180
> +#define QUADSPI_SFA2AD			0x184
> +#define QUADSPI_SFB1AD			0x188
> +#define QUADSPI_SFB2AD			0x18c
> +#define QUADSPI_RBDR(x)			(0x200 + ((x) * 4))
> +
> +#define QUADSPI_LUTKEY			0x300
> +#define QUADSPI_LUTKEY_VALUE		0x5AF05AF0
> +
> +#define QUADSPI_LCKCR			0x304
> +#define QUADSPI_LCKER_LOCK		BIT(0)
> +#define QUADSPI_LCKER_UNLOCK		BIT(1)
> +
> +#define QUADSPI_LUT_BASE		0x310
> +#define QUADSPI_LUT_OFFSET		(SEQID_LUT * 4 * 4)
> +#define QUADSPI_LUT_REG(idx) \
> +	(QUADSPI_LUT_BASE + QUADSPI_LUT_OFFSET + (idx) * 4)
> +
> +/* Instruction set for the LUT register */
> +#define LUT_STOP		0
> +#define LUT_CMD			1
> +#define LUT_ADDR		2
> +#define LUT_DUMMY		3
> +#define LUT_MODE		4
> +#define LUT_MODE2		5
> +#define LUT_MODE4		6
> +#define LUT_FSL_READ		7
> +#define LUT_FSL_WRITE		8
> +#define LUT_JMP_ON_CS		9
> +#define LUT_ADDR_DDR		10
> +#define LUT_MODE_DDR		11
> +#define LUT_MODE2_DDR		12
> +#define LUT_MODE4_DDR		13
> +#define LUT_FSL_READ_DDR	14
> +#define LUT_FSL_WRITE_DDR	15
> +#define LUT_DATA_LEARN		16
> +
> +/*
> + * The PAD definitions for LUT register.
> + *
> + * The pad stands for the number of IO lines [0:3].
> + * For example, the quad read needs four IO lines,
> + * so you should use LUT_PAD(4).
> + */
> +#define LUT_PAD(x) (fls(x) - 1)
> +
> +/*
> + * Macro for constructing the LUT entries with the following
> + * register layout:
> + *
> + *  ---------------------------------------------------
> + *  | INSTR1 | PAD1 | OPRND1 | INSTR0 | PAD0 | OPRND0 |
> + *  ---------------------------------------------------
> + */
> +#define LUT_DEF(idx, ins, pad, opr)					\
> +	((((ins) << 10) | ((pad) << 8) | (opr)) << (((idx) % 2) * 16))
> +
> +/* Controller needs driver to swap endianness */
>   #define QUADSPI_QUIRK_SWAP_ENDIAN	BIT(0)
>   
> -enum fsl_qspi_devtype {
> -	FSL_QUADSPI_VYBRID,
> -	FSL_QUADSPI_IMX6SX,
> -	FSL_QUADSPI_IMX6UL_7D,
> -	FSL_QUADSPI_IMX7ULP,
> -};
> +/* Controller needs 4x internal clock */
> +#define QUADSPI_QUIRK_4X_INT_CLK	BIT(1)
>   
> -struct fsl_qspi_devtype_data {
> -	enum fsl_qspi_devtype devtype;
> -	u32 rxfifo;
> -	u32 txfifo;
> -	u32 ahb_buf_size;
> -	u32 driver_data;
> -};
> +/*
> + * TKT253890, the controller needs the driver to fill the txfifo with
> + * 16 bytes at least to trigger a data transfer, even though the extra
> + * data won't be transferred.
> + */
> +#define QUADSPI_QUIRK_TKT253890		BIT(2)
>   
> -/**
> - * struct fsl_qspi_platdata - platform data for Freescale QSPI
> - *
> - * @flags: Flags for QSPI QSPI_FLAG_...
> - * @speed_hz: Default SCK frequency
> - * @reg_base: Base address of QSPI registers
> - * @amba_base: Base address of QSPI memory mapping
> - * @amba_total_size: size of QSPI memory mapping
> - * @flash_num: Number of active slave devices
> - * @num_chipselect: Number of QSPI chipselect signals
> +/* TKT245618, the controller cannot wake up from wait mode */
> +#define QUADSPI_QUIRK_TKT245618		BIT(3)
> +
> +/*
> + * Controller adds QSPI_AMBA_BASE (base address of the mapped memory)
> + * internally. No need to add it when setting SFXXAD and SFAR registers
>    */
> -struct fsl_qspi_platdata {
> -	u32 flags;
> -	u32 speed_hz;
> -	fdt_addr_t reg_base;
> -	fdt_addr_t amba_base;
> -	fdt_size_t amba_total_size;
> -	u32 flash_num;
> -	u32 num_chipselect;
> -};
> +#define QUADSPI_QUIRK_BASE_INTERNAL	BIT(4)
>   
> -/**
> - * struct fsl_qspi_priv - private data for Freescale QSPI
> - *
> - * @flags: Flags for QSPI QSPI_FLAG_...
> - * @bus_clk: QSPI input clk frequency
> - * @speed_hz: Default SCK frequency
> - * @cur_seqid: current LUT table sequence id
> - * @sf_addr: flash access offset
> - * @amba_base: Base address of QSPI memory mapping of every CS
> - * @amba_total_size: size of QSPI memory mapping
> - * @cur_amba_base: Base address of QSPI memory mapping of current CS
> - * @flash_num: Number of active slave devices
> - * @num_chipselect: Number of QSPI chipselect signals
> - * @regs: Point to QSPI register structure for I/O access
> +/*
> + * Controller uses TDH bits in register QUADSPI_FLSHCR.
> + * They need to be set in accordance with the DDR/SDR mode.
>    */
> -struct fsl_qspi_priv {
> -	u32 flags;
> -	u32 bus_clk;
> -	u32 speed_hz;
> -	u32 cur_seqid;
> -	u32 sf_addr;
> -	u32 amba_base[FSL_QSPI_MAX_CHIPSELECT_NUM];
> -	u32 amba_total_size;
> -	u32 cur_amba_base;
> -	u32 flash_num;
> -	u32 num_chipselect;
> -	struct fsl_qspi_regs *regs;
> -	struct fsl_qspi_devtype_data *devtype_data;
> +#define QUADSPI_QUIRK_USE_TDH_SETTING	BIT(5)
> +
> +struct fsl_qspi_devtype_data {
> +	unsigned int rxfifo;
> +	unsigned int txfifo;
> +	unsigned int ahb_buf_size;
> +	unsigned int quirks;
> +	bool little_endian;
>   };
>   
>   static const struct fsl_qspi_devtype_data vybrid_data = {
> -	.devtype = FSL_QUADSPI_VYBRID,
> -	.rxfifo = 128,
> -	.txfifo = 64,
> -	.ahb_buf_size = 1024,
> -	.driver_data = QUADSPI_QUIRK_SWAP_ENDIAN,
> +	.rxfifo = SZ_128,
> +	.txfifo = SZ_64,
> +	.ahb_buf_size = SZ_1K,
> +	.quirks = QUADSPI_QUIRK_SWAP_ENDIAN,
> +	.little_endian = true,
>   };
>   
>   static const struct fsl_qspi_devtype_data imx6sx_data = {
> -	.devtype = FSL_QUADSPI_IMX6SX,
> -	.rxfifo = 128,
> -	.txfifo = 512,
> -	.ahb_buf_size = 1024,
> -	.driver_data = 0,
> +	.rxfifo = SZ_128,
> +	.txfifo = SZ_512,
> +	.ahb_buf_size = SZ_1K,
> +	.quirks = QUADSPI_QUIRK_4X_INT_CLK | QUADSPI_QUIRK_TKT245618,
> +	.little_endian = true,
> +};
> +
> +static const struct fsl_qspi_devtype_data imx7d_data = {
> +	.rxfifo = SZ_128,
> +	.txfifo = SZ_512,
> +	.ahb_buf_size = SZ_1K,
> +	.quirks = QUADSPI_QUIRK_TKT253890 | QUADSPI_QUIRK_4X_INT_CLK |
> +		  QUADSPI_QUIRK_USE_TDH_SETTING,
> +	.little_endian = true,
> +};
> +
> +static const struct fsl_qspi_devtype_data imx6ul_data = {
> +	.rxfifo = SZ_128,
> +	.txfifo = SZ_512,
> +	.ahb_buf_size = SZ_1K,
> +	.quirks = QUADSPI_QUIRK_TKT253890 | QUADSPI_QUIRK_4X_INT_CLK |
> +		  QUADSPI_QUIRK_USE_TDH_SETTING,
> +	.little_endian = true,
>   };
>   
> -static const struct fsl_qspi_devtype_data imx6ul_7d_data = {
> -	.devtype = FSL_QUADSPI_IMX6UL_7D,
> -	.rxfifo = 128,
> -	.txfifo = 512,
> -	.ahb_buf_size = 1024,
> -	.driver_data = 0,
> +static const struct fsl_qspi_devtype_data ls1021a_data = {
> +	.rxfifo = SZ_128,
> +	.txfifo = SZ_64,
> +	.ahb_buf_size = SZ_1K,
> +	.quirks = 0,
> +	.little_endian = false,
>   };
>   
> -static const struct fsl_qspi_devtype_data imx7ulp_data = {
> -	.devtype = FSL_QUADSPI_IMX7ULP,
> -	.rxfifo = 64,
> -	.txfifo = 64,
> -	.ahb_buf_size = 128,
> -	.driver_data = 0,
> +static const struct fsl_qspi_devtype_data ls1088a_data = {
> +	.rxfifo = SZ_128,
> +	.txfifo = SZ_128,
> +	.ahb_buf_size = SZ_1K,
> +	.quirks = QUADSPI_QUIRK_TKT253890,
> +	.little_endian = true,
>   };
>   
> -static u32 qspi_read32(u32 flags, u32 *addr)
> +static const struct fsl_qspi_devtype_data ls2080a_data = {
> +	.rxfifo = SZ_128,
> +	.txfifo = SZ_64,
> +	.ahb_buf_size = SZ_1K,
> +	.quirks = QUADSPI_QUIRK_TKT253890 | QUADSPI_QUIRK_BASE_INTERNAL,
> +	.little_endian = true,
> +};
> +
> +struct fsl_qspi {
> +	void __iomem *iobase;
> +	void __iomem *ahb_addr;
> +	u32 memmap_phy;
> +	const struct fsl_qspi_devtype_data *devtype_data;
> +	int selected;
> +};
> +
> +static inline int needs_swap_endian(struct fsl_qspi *q)
>   {
> -	return flags & QSPI_FLAG_REGMAP_ENDIAN_BIG ?
> -		in_be32(addr) : in_le32(addr);
> +	return q->devtype_data->quirks & QUADSPI_QUIRK_SWAP_ENDIAN;
>   }
>   
> -static void qspi_write32(u32 flags, u32 *addr, u32 val)
> +static inline int needs_4x_clock(struct fsl_qspi *q)
>   {
> -	flags & QSPI_FLAG_REGMAP_ENDIAN_BIG ?
> -		out_be32(addr, val) : out_le32(addr, val);
> +	return q->devtype_data->quirks & QUADSPI_QUIRK_4X_INT_CLK;
>   }
>   
> -static inline int is_controller_busy(const struct fsl_qspi_priv *priv)
> +static inline int needs_fill_txfifo(struct fsl_qspi *q)
>   {
> -	u32 val;
> -	u32 mask = QSPI_SR_BUSY_MASK | QSPI_SR_AHB_ACC_MASK |
> -		   QSPI_SR_IP_ACC_MASK;
> -
> -	if (priv->flags & QSPI_FLAG_REGMAP_ENDIAN_BIG)
> -		mask = (u32)cpu_to_be32(mask);
> -
> -	return readl_poll_timeout(&priv->regs->sr, val, !(val & mask), 1000);
> +	return q->devtype_data->quirks & QUADSPI_QUIRK_TKT253890;
>   }
>   
> -/* QSPI support swapping the flash read/write data
> - * in hardware for LS102xA, but not for VF610 */
> -static inline u32 qspi_endian_xchg(struct fsl_qspi_priv *priv, u32 data)
> +static inline int needs_wakeup_wait_mode(struct fsl_qspi *q)
>   {
> -	if (priv->devtype_data->driver_data & QUADSPI_QUIRK_SWAP_ENDIAN)
> -		return swab32(data);
> -	else
> -		return data;
> +	return q->devtype_data->quirks & QUADSPI_QUIRK_TKT245618;
>   }
>   
> -static void qspi_set_lut(struct fsl_qspi_priv *priv)
> +static inline int needs_amba_base_offset(struct fsl_qspi *q)
>   {
> -	struct fsl_qspi_regs *regs = priv->regs;
> -	u32 lut_base;
> -
> -	/* Unlock the LUT */
> -	qspi_write32(priv->flags, &regs->lutkey, LUT_KEY_VALUE);
> -	qspi_write32(priv->flags, &regs->lckcr, QSPI_LCKCR_UNLOCK);
> -
> -	/* Write Enable */
> -	lut_base = SEQID_WREN * 4;
> -	qspi_write32(priv->flags, &regs->lut[lut_base], OPRND0(QSPI_CMD_WREN) |
> -		PAD0(LUT_PAD1) | INSTR0(LUT_CMD));
> -	qspi_write32(priv->flags, &regs->lut[lut_base + 1], 0);
> -	qspi_write32(priv->flags, &regs->lut[lut_base + 2], 0);
> -	qspi_write32(priv->flags, &regs->lut[lut_base + 3], 0);
> -
> -	/* Fast Read */
> -	lut_base = SEQID_FAST_READ * 4;
> -#ifdef CONFIG_SPI_FLASH_BAR
> -	qspi_write32(priv->flags, &regs->lut[lut_base],
> -		     OPRND0(QSPI_CMD_FAST_READ) | PAD0(LUT_PAD1) |
> -		     INSTR0(LUT_CMD) | OPRND1(ADDR24BIT) |
> -		     PAD1(LUT_PAD1) | INSTR1(LUT_ADDR));
> -#else
> -	if (FSL_QSPI_FLASH_SIZE  <= SZ_16M)
> -		qspi_write32(priv->flags, &regs->lut[lut_base],
> -			     OPRND0(QSPI_CMD_FAST_READ) | PAD0(LUT_PAD1) |
> -			     INSTR0(LUT_CMD) | OPRND1(ADDR24BIT) |
> -			     PAD1(LUT_PAD1) | INSTR1(LUT_ADDR));
> -	else
> -		qspi_write32(priv->flags, &regs->lut[lut_base],
> -			     OPRND0(QSPI_CMD_FAST_READ_4B) |
> -			     PAD0(LUT_PAD1) | INSTR0(LUT_CMD) |
> -			     OPRND1(ADDR32BIT) | PAD1(LUT_PAD1) |
> -			     INSTR1(LUT_ADDR));
> -#endif
> -	qspi_write32(priv->flags, &regs->lut[lut_base + 1],
> -		     OPRND0(8) | PAD0(LUT_PAD1) | INSTR0(LUT_DUMMY) |
> -		     OPRND1(priv->devtype_data->rxfifo) | PAD1(LUT_PAD1) |
> -		     INSTR1(LUT_READ));
> -	qspi_write32(priv->flags, &regs->lut[lut_base + 2], 0);
> -	qspi_write32(priv->flags, &regs->lut[lut_base + 3], 0);
> -
> -	/* Read Status */
> -	lut_base = SEQID_RDSR * 4;
> -	qspi_write32(priv->flags, &regs->lut[lut_base], OPRND0(QSPI_CMD_RDSR) |
> -		PAD0(LUT_PAD1) | INSTR0(LUT_CMD) | OPRND1(1) |
> -		PAD1(LUT_PAD1) | INSTR1(LUT_READ));
> -	qspi_write32(priv->flags, &regs->lut[lut_base + 1], 0);
> -	qspi_write32(priv->flags, &regs->lut[lut_base + 2], 0);
> -	qspi_write32(priv->flags, &regs->lut[lut_base + 3], 0);
> -
> -	/* Erase a sector */
> -	lut_base = SEQID_SE * 4;
> -#ifdef CONFIG_SPI_FLASH_BAR
> -	qspi_write32(priv->flags, &regs->lut[lut_base], OPRND0(QSPI_CMD_SE) |
> -		     PAD0(LUT_PAD1) | INSTR0(LUT_CMD) | OPRND1(ADDR24BIT) |
> -		     PAD1(LUT_PAD1) | INSTR1(LUT_ADDR));
> -#else
> -	if (FSL_QSPI_FLASH_SIZE  <= SZ_16M)
> -		qspi_write32(priv->flags, &regs->lut[lut_base],
> -			     OPRND0(QSPI_CMD_SE) | PAD0(LUT_PAD1) |
> -			     INSTR0(LUT_CMD) | OPRND1(ADDR24BIT) |
> -			     PAD1(LUT_PAD1) | INSTR1(LUT_ADDR));
> -	else
> -		qspi_write32(priv->flags, &regs->lut[lut_base],
> -			     OPRND0(QSPI_CMD_SE_4B) | PAD0(LUT_PAD1) |
> -			     INSTR0(LUT_CMD) | OPRND1(ADDR32BIT) |
> -			     PAD1(LUT_PAD1) | INSTR1(LUT_ADDR));
> -#endif
> -	qspi_write32(priv->flags, &regs->lut[lut_base + 1], 0);
> -	qspi_write32(priv->flags, &regs->lut[lut_base + 2], 0);
> -	qspi_write32(priv->flags, &regs->lut[lut_base + 3], 0);
> -
> -	/* Erase the whole chip */
> -	lut_base = SEQID_CHIP_ERASE * 4;
> -	qspi_write32(priv->flags, &regs->lut[lut_base],
> -		     OPRND0(QSPI_CMD_CHIP_ERASE) |
> -		     PAD0(LUT_PAD1) | INSTR0(LUT_CMD));
> -	qspi_write32(priv->flags, &regs->lut[lut_base + 1], 0);
> -	qspi_write32(priv->flags, &regs->lut[lut_base + 2], 0);
> -	qspi_write32(priv->flags, &regs->lut[lut_base + 3], 0);
> -
> -	/* Page Program */
> -	lut_base = SEQID_PP * 4;
> -#ifdef CONFIG_SPI_FLASH_BAR
> -	qspi_write32(priv->flags, &regs->lut[lut_base], OPRND0(QSPI_CMD_PP) |
> -		     PAD0(LUT_PAD1) | INSTR0(LUT_CMD) | OPRND1(ADDR24BIT) |
> -		     PAD1(LUT_PAD1) | INSTR1(LUT_ADDR));
> -#else
> -	if (FSL_QSPI_FLASH_SIZE  <= SZ_16M)
> -		qspi_write32(priv->flags, &regs->lut[lut_base],
> -			     OPRND0(QSPI_CMD_PP) | PAD0(LUT_PAD1) |
> -			     INSTR0(LUT_CMD) | OPRND1(ADDR24BIT) |
> -			     PAD1(LUT_PAD1) | INSTR1(LUT_ADDR));
> -	else
> -		qspi_write32(priv->flags, &regs->lut[lut_base],
> -			     OPRND0(QSPI_CMD_PP_4B) | PAD0(LUT_PAD1) |
> -			     INSTR0(LUT_CMD) | OPRND1(ADDR32BIT) |
> -			     PAD1(LUT_PAD1) | INSTR1(LUT_ADDR));
> -#endif
> -	/* Use IDATSZ in IPCR to determine the size and here set 0. */
> -	qspi_write32(priv->flags, &regs->lut[lut_base + 1], OPRND0(0) |
> -		     PAD0(LUT_PAD1) | INSTR0(LUT_WRITE));
> -	qspi_write32(priv->flags, &regs->lut[lut_base + 2], 0);
> -	qspi_write32(priv->flags, &regs->lut[lut_base + 3], 0);
> -
> -	/* READ ID */
> -	lut_base = SEQID_RDID * 4;
> -	qspi_write32(priv->flags, &regs->lut[lut_base], OPRND0(QSPI_CMD_RDID) |
> -		PAD0(LUT_PAD1) | INSTR0(LUT_CMD) | OPRND1(8) |
> -		PAD1(LUT_PAD1) | INSTR1(LUT_READ));
> -	qspi_write32(priv->flags, &regs->lut[lut_base + 1], 0);
> -	qspi_write32(priv->flags, &regs->lut[lut_base + 2], 0);
> -	qspi_write32(priv->flags, &regs->lut[lut_base + 3], 0);
> -
> -	/* SUB SECTOR 4K ERASE */
> -	lut_base = SEQID_BE_4K * 4;
> -	qspi_write32(priv->flags, &regs->lut[lut_base], OPRND0(QSPI_CMD_BE_4K) |
> -		     PAD0(LUT_PAD1) | INSTR0(LUT_CMD) | OPRND1(ADDR24BIT) |
> -		     PAD1(LUT_PAD1) | INSTR1(LUT_ADDR));
> -
> -#ifdef CONFIG_SPI_FLASH_BAR
> -	/*
> -	 * BRRD BRWR RDEAR WREAR are all supported, because it is hard to
> -	 * dynamically check whether to set BRRD BRWR or RDEAR WREAR during
> -	 * initialization.
> -	 */
> -	lut_base = SEQID_BRRD * 4;
> -	qspi_write32(priv->flags, &regs->lut[lut_base], OPRND0(QSPI_CMD_BRRD) |
> -		     PAD0(LUT_PAD1) | INSTR0(LUT_CMD) | OPRND1(1) |
> -		     PAD1(LUT_PAD1) | INSTR1(LUT_READ));
> -
> -	lut_base = SEQID_BRWR * 4;
> -	qspi_write32(priv->flags, &regs->lut[lut_base], OPRND0(QSPI_CMD_BRWR) |
> -		     PAD0(LUT_PAD1) | INSTR0(LUT_CMD) | OPRND1(1) |
> -		     PAD1(LUT_PAD1) | INSTR1(LUT_WRITE));
> -
> -	lut_base = SEQID_RDEAR * 4;
> -	qspi_write32(priv->flags, &regs->lut[lut_base], OPRND0(QSPI_CMD_RDEAR) |
> -		     PAD0(LUT_PAD1) | INSTR0(LUT_CMD) | OPRND1(1) |
> -		     PAD1(LUT_PAD1) | INSTR1(LUT_READ));
> -
> -	lut_base = SEQID_WREAR * 4;
> -	qspi_write32(priv->flags, &regs->lut[lut_base], OPRND0(QSPI_CMD_WREAR) |
> -		     PAD0(LUT_PAD1) | INSTR0(LUT_CMD) | OPRND1(1) |
> -		     PAD1(LUT_PAD1) | INSTR1(LUT_WRITE));
> -#endif
> -
> -	/*
> -	 * Read any device register.
> -	 * Used for Spansion S25FS-S family flash only.
> -	 */
> -	lut_base = SEQID_RDAR * 4;
> -	qspi_write32(priv->flags, &regs->lut[lut_base],
> -		     OPRND0(QSPI_CMD_RDAR) | PAD0(LUT_PAD1) |
> -		     INSTR0(LUT_CMD) | OPRND1(ADDR24BIT) |
> -		     PAD1(LUT_PAD1) | INSTR1(LUT_ADDR));
> -	qspi_write32(priv->flags, &regs->lut[lut_base + 1],
> -		     OPRND0(8) | PAD0(LUT_PAD1) | INSTR0(LUT_DUMMY) |
> -		     OPRND1(1) | PAD1(LUT_PAD1) |
> -		     INSTR1(LUT_READ));
> +	return !(q->devtype_data->quirks & QUADSPI_QUIRK_BASE_INTERNAL);
> +}
>   
> -	/*
> -	 * Write any device register.
> -	 * Used for Spansion S25FS-S family flash only.
> -	 */
> -	lut_base = SEQID_WRAR * 4;
> -	qspi_write32(priv->flags, &regs->lut[lut_base],
> -		     OPRND0(QSPI_CMD_WRAR) | PAD0(LUT_PAD1) |
> -		     INSTR0(LUT_CMD) | OPRND1(ADDR24BIT) |
> -		     PAD1(LUT_PAD1) | INSTR1(LUT_ADDR));
> -	qspi_write32(priv->flags, &regs->lut[lut_base + 1],
> -		     OPRND0(1) | PAD0(LUT_PAD1) | INSTR0(LUT_WRITE));
> -
> -	/* Lock the LUT */
> -	qspi_write32(priv->flags, &regs->lutkey, LUT_KEY_VALUE);
> -	qspi_write32(priv->flags, &regs->lckcr, QSPI_LCKCR_LOCK);
> +static inline int needs_tdh_setting(struct fsl_qspi *q)
> +{
> +	return q->devtype_data->quirks & QUADSPI_QUIRK_USE_TDH_SETTING;
>   }
>   
> -#if defined(CONFIG_SYS_FSL_QSPI_AHB)
>   /*
> - * If we have changed the content of the flash by writing or erasing,
> - * we need to invalidate the AHB buffer. If we do not do so, we may read out
> - * the wrong data. The spec tells us reset the AHB domain and Serial Flash
> - * domain at the same time.
> + * An IC bug makes it necessary to rearrange the 32-bit data.
> + * Later chips, such as IMX6SLX, have fixed this bug.
>    */
> -static inline void qspi_ahb_invalid(struct fsl_qspi_priv *priv)
> +static inline u32 fsl_qspi_endian_xchg(struct fsl_qspi *q, u32 a)
>   {
> -	struct fsl_qspi_regs *regs = priv->regs;
> -	u32 reg;
> -
> -	reg = qspi_read32(priv->flags, &regs->mcr);
> -	reg |= QSPI_MCR_SWRSTHD_MASK | QSPI_MCR_SWRSTSD_MASK;
> -	qspi_write32(priv->flags, &regs->mcr, reg);
> -
> -	/*
> -	 * The minimum delay : 1 AHB + 2 SFCK clocks.
> -	 * Delay 1 us is enough.
> -	 */
> -	udelay(1);
> -
> -	reg &= ~(QSPI_MCR_SWRSTHD_MASK | QSPI_MCR_SWRSTSD_MASK);
> -	qspi_write32(priv->flags, &regs->mcr, reg);
> +	return needs_swap_endian(q) ? __swab32(a) : a;
>   }
>   
> -/* Read out the data from the AHB buffer. */
> -static inline void qspi_ahb_read(struct fsl_qspi_priv *priv, u8 *rxbuf, int len)
> +/*
> + * R/W functions for big- or little-endian registers:
> + * The QSPI controller's endianness is independent of
> + * the CPU core's endianness. So far, although the CPU
> + * core is little-endian the QSPI controller can use
> + * big-endian or little-endian.
> + */
> +static void qspi_writel(struct fsl_qspi *q, u32 val, void __iomem *addr)
>   {
> -	struct fsl_qspi_regs *regs = priv->regs;
> -	u32 mcr_reg;
> -	void *rx_addr;
> -
> -	mcr_reg = qspi_read32(priv->flags, &regs->mcr);
> -
> -	qspi_write32(priv->flags, &regs->mcr,
> -		     QSPI_MCR_CLR_RXF_MASK | QSPI_MCR_CLR_TXF_MASK |
> -		     mcr_reg);
> +	if (q->devtype_data->little_endian)
> +		out_le32(addr, val);
> +	else
> +		out_be32(addr, val);
> +}
>   
> -	rx_addr = (void *)(uintptr_t)(priv->cur_amba_base + priv->sf_addr);
> -	/* Read out the data directly from the AHB buffer. */
> -	memcpy(rxbuf, rx_addr, len);
> +static u32 qspi_readl(struct fsl_qspi *q, void __iomem *addr)
> +{
> +	if (q->devtype_data->little_endian)
> +		return in_le32(addr);
>   
> -	qspi_write32(priv->flags, &regs->mcr, mcr_reg);
> +	return in_be32(addr);
>   }
>   
> -static void qspi_enable_ddr_mode(struct fsl_qspi_priv *priv)
> +static int fsl_qspi_check_buswidth(struct fsl_qspi *q, u8 width)
>   {
> -	u32 reg, reg2;
> -	struct fsl_qspi_regs *regs = priv->regs;
> +	switch (width) {
> +	case 1:
> +	case 2:
> +	case 4:
> +		return 0;
> +	}
>   
> -	reg = qspi_read32(priv->flags, &regs->mcr);
> -	/* Disable the module */
> -	qspi_write32(priv->flags, &regs->mcr, reg | QSPI_MCR_MDIS_MASK);
> -
> -	/* Set the Sampling Register for DDR */
> -	reg2 = qspi_read32(priv->flags, &regs->smpr);
> -	reg2 &= ~QSPI_SMPR_DDRSMP_MASK;
> -	reg2 |= (2 << QSPI_SMPR_DDRSMP_SHIFT);
> -	qspi_write32(priv->flags, &regs->smpr, reg2);
> -
> -	/* Enable the module again (enable the DDR too) */
> -	reg |= QSPI_MCR_DDR_EN_MASK;
> -	/* Enable bit 29 for imx6sx */
> -	reg |= BIT(29);
> -	qspi_write32(priv->flags, &regs->mcr, reg);
> -
> -	/* Enable the TDH to 1 for some platforms like imx6ul, imx7d, etc
> -	 * These two bits are reserved on other platforms
> -	 */
> -	reg = qspi_read32(priv->flags, &regs->flshcr);
> -	reg &= ~(BIT(17));
> -	reg |= BIT(16);
> -	qspi_write32(priv->flags, &regs->flshcr, reg);
> +	return -ENOTSUPP;
>   }
>   
> -/*
> - * There are two different ways to read out the data from the flash:
> - *  the "IP Command Read" and the "AHB Command Read".
> - *
> - * The IC guy suggests we use the "AHB Command Read" which is faster
> - * then the "IP Command Read". (What's more is that there is a bug in
> - * the "IP Command Read" in the Vybrid.)
> - *
> - * After we set up the registers for the "AHB Command Read", we can use
> - * the memcpy to read the data directly. A "missed" access to the buffer
> - * causes the controller to clear the buffer, and use the sequence pointed
> - * by the QUADSPI_BFGENCR[SEQID] to initiate a read from the flash.
> - */
> -static void qspi_init_ahb_read(struct fsl_qspi_priv *priv)
> +static bool fsl_qspi_supports_op(struct spi_slave *slave,
> +				 const struct spi_mem_op *op)
>   {
> -	struct fsl_qspi_regs *regs = priv->regs;
> +	struct fsl_qspi *q = dev_get_priv(slave->dev->parent);
> +	int ret;
> +
> +	ret = fsl_qspi_check_buswidth(q, op->cmd.buswidth);
>   
> -	/* AHB configuration for access buffer 0/1/2 .*/
> -	qspi_write32(priv->flags, &regs->buf0cr, QSPI_BUFXCR_INVALID_MSTRID);
> -	qspi_write32(priv->flags, &regs->buf1cr, QSPI_BUFXCR_INVALID_MSTRID);
> -	qspi_write32(priv->flags, &regs->buf2cr, QSPI_BUFXCR_INVALID_MSTRID);
> -	qspi_write32(priv->flags, &regs->buf3cr, QSPI_BUF3CR_ALLMST_MASK |
> -		     ((priv->devtype_data->ahb_buf_size >> 3) << QSPI_BUF3CR_ADATSZ_SHIFT));
> +	if (op->addr.nbytes)
> +		ret |= fsl_qspi_check_buswidth(q, op->addr.buswidth);
>   
> -	/* We only use the buffer3 */
> -	qspi_write32(priv->flags, &regs->buf0ind, 0);
> -	qspi_write32(priv->flags, &regs->buf1ind, 0);
> -	qspi_write32(priv->flags, &regs->buf2ind, 0);
> +	if (op->dummy.nbytes)
> +		ret |= fsl_qspi_check_buswidth(q, op->dummy.buswidth);
> +
> +	if (op->data.nbytes)
> +		ret |= fsl_qspi_check_buswidth(q, op->data.buswidth);
> +
> +	if (ret)
> +		return false;
>   
>   	/*
> -	 * Set the default lut sequence for AHB Read.
> -	 * Parallel mode is disabled.
> +	 * The number of instructions needed for the op, needs
> +	 * to fit into a single LUT entry.
>   	 */
> -	qspi_write32(priv->flags, &regs->bfgencr,
> -		     SEQID_FAST_READ << QSPI_BFGENCR_SEQID_SHIFT);
> -
> -	/*Enable DDR Mode*/
> -	qspi_enable_ddr_mode(priv);
> +	if (op->addr.nbytes +
> +	   (op->dummy.nbytes ? 1 : 0) +
> +	   (op->data.nbytes ? 1 : 0) > 6)
> +		return false;
> +
> +	/* Max 64 dummy clock cycles supported */
> +	if (op->dummy.nbytes &&
> +	    (op->dummy.nbytes * 8 / op->dummy.buswidth > 64))
> +		return false;
> +
> +	/* Max data length, check controller limits and alignment */
> +	if (op->data.dir == SPI_MEM_DATA_IN &&
> +	    (op->data.nbytes > q->devtype_data->ahb_buf_size ||
> +	     (op->data.nbytes > q->devtype_data->rxfifo - 4 &&
> +	      !IS_ALIGNED(op->data.nbytes, 8))))
> +		return false;
> +
> +	if (op->data.dir == SPI_MEM_DATA_OUT &&
> +	    op->data.nbytes > q->devtype_data->txfifo)
> +		return false;
> +
> +	return true;
>   }
> -#endif
>   
> -#ifdef CONFIG_SPI_FLASH_BAR
> -/* Bank register read/write, EAR register read/write */
> -static void qspi_op_rdbank(struct fsl_qspi_priv *priv, u8 *rxbuf, u32 len)
> +static void fsl_qspi_prepare_lut(struct fsl_qspi *q,
> +				 const struct spi_mem_op *op)
>   {
> -	struct fsl_qspi_regs *regs = priv->regs;
> -	u32 reg, mcr_reg, data, seqid;
> +	void __iomem *base = q->iobase;
> +	u32 lutval[4] = {};
> +	int lutidx = 1, i;
>   
> -	mcr_reg = qspi_read32(priv->flags, &regs->mcr);
> -	qspi_write32(priv->flags, &regs->mcr,
> -		     QSPI_MCR_CLR_RXF_MASK | QSPI_MCR_CLR_TXF_MASK |
> -		     mcr_reg);
> -	qspi_write32(priv->flags, &regs->rbct, QSPI_RBCT_RXBRD_USEIPS);
> +	lutval[0] |= LUT_DEF(0, LUT_CMD, LUT_PAD(op->cmd.buswidth),
> +			     op->cmd.opcode);
>   
> -	qspi_write32(priv->flags, &regs->sfar, priv->cur_amba_base);
> +	/*
> +	 * For some unknown reason, using LUT_ADDR doesn't work in some
> +	 * cases (at least with only one byte long addresses), so
> +	 * let's use LUT_MODE to write the address bytes one by one
> +	 */
> +	for (i = 0; i < op->addr.nbytes; i++) {
> +		u8 addrbyte = op->addr.val >> (8 * (op->addr.nbytes - i - 1));
>   
> -	if (priv->cur_seqid == QSPI_CMD_BRRD)
> -		seqid = SEQID_BRRD;
> -	else
> -		seqid = SEQID_RDEAR;
> -
> -	qspi_write32(priv->flags, &regs->ipcr,
> -		     (seqid << QSPI_IPCR_SEQID_SHIFT) | len);
> -
> -	/* Wait previous command complete */
> -	while (qspi_read32(priv->flags, &regs->sr) & QSPI_SR_BUSY_MASK)
> -		;
> -
> -	while (1) {
> -		WATCHDOG_RESET();
> -
> -		reg = qspi_read32(priv->flags, &regs->rbsr);
> -		if (reg & QSPI_RBSR_RDBFL_MASK) {
> -			data = qspi_read32(priv->flags, &regs->rbdr[0]);
> -			data = qspi_endian_xchg(priv, data);
> -			memcpy(rxbuf, &data, len);
> -			qspi_write32(priv->flags, &regs->mcr,
> -				     qspi_read32(priv->flags, &regs->mcr) |
> -				     QSPI_MCR_CLR_RXF_MASK);
> -			break;
> -		}
> +		lutval[lutidx / 2] |= LUT_DEF(lutidx, LUT_MODE,
> +					      LUT_PAD(op->addr.buswidth),
> +					      addrbyte);
> +		lutidx++;
>   	}
>   
> -	qspi_write32(priv->flags, &regs->mcr, mcr_reg);
> -}
> -#endif
> -
> -static void qspi_op_rdid(struct fsl_qspi_priv *priv, u32 *rxbuf, u32 len)
> -{
> -	struct fsl_qspi_regs *regs = priv->regs;
> -	u32 mcr_reg, rbsr_reg, data, size;
> -	int i;
> -
> -	mcr_reg = qspi_read32(priv->flags, &regs->mcr);
> -	qspi_write32(priv->flags, &regs->mcr,
> -		     QSPI_MCR_CLR_RXF_MASK | QSPI_MCR_CLR_TXF_MASK |
> -		     mcr_reg);
> -	qspi_write32(priv->flags, &regs->rbct, QSPI_RBCT_RXBRD_USEIPS);
> -
> -	qspi_write32(priv->flags, &regs->sfar, priv->cur_amba_base);
> -
> -	qspi_write32(priv->flags, &regs->ipcr,
> -		     (SEQID_RDID << QSPI_IPCR_SEQID_SHIFT) | 0);
> -	while (qspi_read32(priv->flags, &regs->sr) & QSPI_SR_BUSY_MASK)
> -		;
> -
> -	i = 0;
> -	while ((priv->devtype_data->rxfifo >= len) && (len > 0)) {
> -		WATCHDOG_RESET();
> -
> -		rbsr_reg = qspi_read32(priv->flags, &regs->rbsr);
> -		if (rbsr_reg & QSPI_RBSR_RDBFL_MASK) {
> -			data = qspi_read32(priv->flags, &regs->rbdr[i]);
> -			data = qspi_endian_xchg(priv, data);
> -			size = (len < 4) ? len : 4;
> -			memcpy(rxbuf, &data, size);
> -			len -= size;
> -			rxbuf++;
> -			i++;
> -		}
> +	if (op->dummy.nbytes) {
> +		lutval[lutidx / 2] |= LUT_DEF(lutidx, LUT_DUMMY,
> +					      LUT_PAD(op->dummy.buswidth),
> +					      op->dummy.nbytes * 8 /
> +					      op->dummy.buswidth);
> +		lutidx++;
>   	}
>   
> -	qspi_write32(priv->flags, &regs->mcr, mcr_reg);
> -}
> -
> -/* If not use AHB read, read data from ip interface */
> -static void qspi_op_read(struct fsl_qspi_priv *priv, u32 *rxbuf, u32 len)
> -{
> -	struct fsl_qspi_regs *regs = priv->regs;
> -	u32 mcr_reg, data;
> -	int i, size;
> -	u32 to_or_from;
> -	u32 seqid;
> -
> -	if (priv->cur_seqid == QSPI_CMD_RDAR)
> -		seqid = SEQID_RDAR;
> -	else
> -		seqid = SEQID_FAST_READ;
> -
> -	mcr_reg = qspi_read32(priv->flags, &regs->mcr);
> -	qspi_write32(priv->flags, &regs->mcr,
> -		     QSPI_MCR_CLR_RXF_MASK | QSPI_MCR_CLR_TXF_MASK |
> -		     mcr_reg);
> -	qspi_write32(priv->flags, &regs->rbct, QSPI_RBCT_RXBRD_USEIPS);
> -
> -	to_or_from = priv->sf_addr + priv->cur_amba_base;
> -
> -	while (len > 0) {
> -		WATCHDOG_RESET();
> -
> -		qspi_write32(priv->flags, &regs->sfar, to_or_from);
> -
> -		size = (len > priv->devtype_data->rxfifo) ?
> -			priv->devtype_data->rxfifo : len;
> -
> -		qspi_write32(priv->flags, &regs->ipcr,
> -			     (seqid << QSPI_IPCR_SEQID_SHIFT) |
> -			     size);
> -		while (qspi_read32(priv->flags, &regs->sr) & QSPI_SR_BUSY_MASK)
> -			;
> -
> -		to_or_from += size;
> -		len -= size;
> -
> -		i = 0;
> -		while ((priv->devtype_data->rxfifo >= size) && (size > 0)) {
> -			data = qspi_read32(priv->flags, &regs->rbdr[i]);
> -			data = qspi_endian_xchg(priv, data);
> -			if (size < 4)
> -				memcpy(rxbuf, &data, size);
> -			else
> -				memcpy(rxbuf, &data, 4);
> -			rxbuf++;
> -			size -= 4;
> -			i++;
> -		}
> -		qspi_write32(priv->flags, &regs->mcr,
> -			     qspi_read32(priv->flags, &regs->mcr) |
> -			     QSPI_MCR_CLR_RXF_MASK);
> +	if (op->data.nbytes) {
> +		lutval[lutidx / 2] |= LUT_DEF(lutidx,
> +					      op->data.dir == SPI_MEM_DATA_IN ?
> +					      LUT_FSL_READ : LUT_FSL_WRITE,
> +					      LUT_PAD(op->data.buswidth),
> +					      0);
> +		lutidx++;
>   	}
>   
> -	qspi_write32(priv->flags, &regs->mcr, mcr_reg);
> -}
> +	lutval[lutidx / 2] |= LUT_DEF(lutidx, LUT_STOP, 0, 0);
>   
> -static void qspi_op_write(struct fsl_qspi_priv *priv, u8 *txbuf, u32 len)
> -{
> -	struct fsl_qspi_regs *regs = priv->regs;
> -	u32 mcr_reg, data, reg, status_reg, seqid;
> -	int i, size, tx_size;
> -	u32 to_or_from = 0;
> -
> -	mcr_reg = qspi_read32(priv->flags, &regs->mcr);
> -	qspi_write32(priv->flags, &regs->mcr,
> -		     QSPI_MCR_CLR_RXF_MASK | QSPI_MCR_CLR_TXF_MASK |
> -		     mcr_reg);
> -	qspi_write32(priv->flags, &regs->rbct, QSPI_RBCT_RXBRD_USEIPS);
> -
> -	status_reg = 0;
> -	while ((status_reg & FLASH_STATUS_WEL) != FLASH_STATUS_WEL) {
> -		WATCHDOG_RESET();
> -
> -		qspi_write32(priv->flags, &regs->ipcr,
> -			     (SEQID_WREN << QSPI_IPCR_SEQID_SHIFT) | 0);
> -		while (qspi_read32(priv->flags, &regs->sr) & QSPI_SR_BUSY_MASK)
> -			;
> -
> -		qspi_write32(priv->flags, &regs->ipcr,
> -			     (SEQID_RDSR << QSPI_IPCR_SEQID_SHIFT) | 1);
> -		while (qspi_read32(priv->flags, &regs->sr) & QSPI_SR_BUSY_MASK)
> -			;
> -
> -		reg = qspi_read32(priv->flags, &regs->rbsr);
> -		if (reg & QSPI_RBSR_RDBFL_MASK) {
> -			status_reg = qspi_read32(priv->flags, &regs->rbdr[0]);
> -			status_reg = qspi_endian_xchg(priv, status_reg);
> -		}
> -		qspi_write32(priv->flags, &regs->mcr,
> -			     qspi_read32(priv->flags, &regs->mcr) |
> -			     QSPI_MCR_CLR_RXF_MASK);
> -	}
> +	/* unlock LUT */
> +	qspi_writel(q, QUADSPI_LUTKEY_VALUE, q->iobase + QUADSPI_LUTKEY);
> +	qspi_writel(q, QUADSPI_LCKER_UNLOCK, q->iobase + QUADSPI_LCKCR);
> +
> +	dev_dbg(q->dev, "CMD[%x] lutval[0:%x \t 1:%x \t 2:%x \t 3:%x]\n",
> +		op->cmd.opcode, lutval[0], lutval[1], lutval[2], lutval[3]);
>   
> -	/* Default is page programming */
> -	seqid = SEQID_PP;
> -	if (priv->cur_seqid == QSPI_CMD_WRAR)
> -		seqid = SEQID_WRAR;
> -#ifdef CONFIG_SPI_FLASH_BAR
> -	if (priv->cur_seqid == QSPI_CMD_BRWR)
> -		seqid = SEQID_BRWR;
> -	else if (priv->cur_seqid == QSPI_CMD_WREAR)
> -		seqid = SEQID_WREAR;
> -#endif
> +	/* fill LUT */
> +	for (i = 0; i < ARRAY_SIZE(lutval); i++)
> +		qspi_writel(q, lutval[i], base + QUADSPI_LUT_REG(i));
>   
> -	to_or_from = priv->sf_addr + priv->cur_amba_base;
> +	/* lock LUT */
> +	qspi_writel(q, QUADSPI_LUTKEY_VALUE, q->iobase + QUADSPI_LUTKEY);
> +	qspi_writel(q, QUADSPI_LCKER_LOCK, q->iobase + QUADSPI_LCKCR);
> +}
>   
> -	qspi_write32(priv->flags, &regs->sfar, to_or_from);
> +/*
> + * If we have changed the content of the flash by writing or erasing, or if we
> + * read from flash with a different offset into the page buffer, we need to
> + * invalidate the AHB buffer. If we do not do so, we may read out the wrong
> + * data. The spec tells us reset the AHB domain and Serial Flash domain at
> + * the same time.
> + */
> +static void fsl_qspi_invalidate(struct fsl_qspi *q)
> +{
> +	u32 reg;
>   
> -	tx_size = (len > priv->devtype_data->txfifo) ?
> -		priv->devtype_data->txfifo : len;
> +	reg = qspi_readl(q, q->iobase + QUADSPI_MCR);
> +	reg |= QUADSPI_MCR_SWRSTHD_MASK | QUADSPI_MCR_SWRSTSD_MASK;
> +	qspi_writel(q, reg, q->iobase + QUADSPI_MCR);
>   
> -	size = tx_size / 16;
>   	/*
> -	 * There must be atleast 128bit data
> -	 * available in TX FIFO for any pop operation
> +	 * The minimum delay : 1 AHB + 2 SFCK clocks.
> +	 * Delay 1 us is enough.
>   	 */
> -	if (tx_size % 16)
> -		size++;
> -	for (i = 0; i < size * 4; i++) {
> -		memcpy(&data, txbuf, 4);
> -		data = qspi_endian_xchg(priv, data);
> -		qspi_write32(priv->flags, &regs->tbdr, data);
> -		txbuf += 4;
> -	}
> -
> -	qspi_write32(priv->flags, &regs->ipcr,
> -		     (seqid << QSPI_IPCR_SEQID_SHIFT) | tx_size);
> -	while (qspi_read32(priv->flags, &regs->sr) & QSPI_SR_BUSY_MASK)
> -		;
> +	udelay(1);
>   
> -	qspi_write32(priv->flags, &regs->mcr, mcr_reg);
> +	reg &= ~(QUADSPI_MCR_SWRSTHD_MASK | QUADSPI_MCR_SWRSTSD_MASK);
> +	qspi_writel(q, reg, q->iobase + QUADSPI_MCR);
>   }
>   
> -static void qspi_op_rdsr(struct fsl_qspi_priv *priv, void *rxbuf, u32 len)
> +static void fsl_qspi_select_mem(struct fsl_qspi *q, struct spi_slave *slave)
>   {
> -	struct fsl_qspi_regs *regs = priv->regs;
> -	u32 mcr_reg, reg, data;
> -
> -	mcr_reg = qspi_read32(priv->flags, &regs->mcr);
> -	qspi_write32(priv->flags, &regs->mcr,
> -		     QSPI_MCR_CLR_RXF_MASK | QSPI_MCR_CLR_TXF_MASK |
> -		     mcr_reg);
> -	qspi_write32(priv->flags, &regs->rbct, QSPI_RBCT_RXBRD_USEIPS);
> -
> -	qspi_write32(priv->flags, &regs->sfar, priv->cur_amba_base);
> -
> -	qspi_write32(priv->flags, &regs->ipcr,
> -		     (SEQID_RDSR << QSPI_IPCR_SEQID_SHIFT) | 0);
> -	while (qspi_read32(priv->flags, &regs->sr) & QSPI_SR_BUSY_MASK)
> -		;
> -
> -	while (1) {
> -		WATCHDOG_RESET();
> -
> -		reg = qspi_read32(priv->flags, &regs->rbsr);
> -		if (reg & QSPI_RBSR_RDBFL_MASK) {
> -			data = qspi_read32(priv->flags, &regs->rbdr[0]);
> -			data = qspi_endian_xchg(priv, data);
> -			memcpy(rxbuf, &data, len);
> -			qspi_write32(priv->flags, &regs->mcr,
> -				     qspi_read32(priv->flags, &regs->mcr) |
> -				     QSPI_MCR_CLR_RXF_MASK);
> -			break;
> -		}
> -	}
> +	struct dm_spi_slave_platdata *plat =
> +		dev_get_parent_platdata(slave->dev);
> +
> +	if (q->selected == plat->cs)
> +		return;
>   
> -	qspi_write32(priv->flags, &regs->mcr, mcr_reg);
> +	q->selected = plat->cs;
> +	fsl_qspi_invalidate(q);
>   }
>   
> -static void qspi_op_erase(struct fsl_qspi_priv *priv)
> +static void fsl_qspi_read_ahb(struct fsl_qspi *q, const struct spi_mem_op *op)
>   {
> -	struct fsl_qspi_regs *regs = priv->regs;
> -	u32 mcr_reg;
> -	u32 to_or_from = 0;
> -
> -	mcr_reg = qspi_read32(priv->flags, &regs->mcr);
> -	qspi_write32(priv->flags, &regs->mcr,
> -		     QSPI_MCR_CLR_RXF_MASK | QSPI_MCR_CLR_TXF_MASK |
> -		     mcr_reg);
> -	qspi_write32(priv->flags, &regs->rbct, QSPI_RBCT_RXBRD_USEIPS);
> -
> -	to_or_from = priv->sf_addr + priv->cur_amba_base;
> -	qspi_write32(priv->flags, &regs->sfar, to_or_from);
> -
> -	qspi_write32(priv->flags, &regs->ipcr,
> -		     (SEQID_WREN << QSPI_IPCR_SEQID_SHIFT) | 0);
> -	while (qspi_read32(priv->flags, &regs->sr) & QSPI_SR_BUSY_MASK)
> -		;
> -
> -	if (priv->cur_seqid == QSPI_CMD_SE) {
> -		qspi_write32(priv->flags, &regs->ipcr,
> -			     (SEQID_SE << QSPI_IPCR_SEQID_SHIFT) | 0);
> -	} else if (priv->cur_seqid == QSPI_CMD_BE_4K) {
> -		qspi_write32(priv->flags, &regs->ipcr,
> -			     (SEQID_BE_4K << QSPI_IPCR_SEQID_SHIFT) | 0);
> -	}
> -	while (qspi_read32(priv->flags, &regs->sr) & QSPI_SR_BUSY_MASK)
> -		;
> -
> -	qspi_write32(priv->flags, &regs->mcr, mcr_reg);
> +	memcpy_fromio(op->data.buf.in,
> +		      q->ahb_addr + q->selected * q->devtype_data->ahb_buf_size,
> +		      op->data.nbytes);
>   }
>   
> -int qspi_xfer(struct fsl_qspi_priv *priv, unsigned int bitlen,
> -		const void *dout, void *din, unsigned long flags)
> +static void fsl_qspi_fill_txfifo(struct fsl_qspi *q,
> +				 const struct spi_mem_op *op)
>   {
> -	u32 bytes = DIV_ROUND_UP(bitlen, 8);
> -	static u32 wr_sfaddr;
> -	u32 txbuf;
> -
> -	WATCHDOG_RESET();
> -
> -	if (dout) {
> -		if (flags & SPI_XFER_BEGIN) {
> -			priv->cur_seqid = *(u8 *)dout;
> -			memcpy(&txbuf, dout, 4);
> -		}
> -
> -		if (flags == SPI_XFER_END) {
> -			priv->sf_addr = wr_sfaddr;
> -			qspi_op_write(priv, (u8 *)dout, bytes);
> -			return 0;
> -		}
> -
> -		if (priv->cur_seqid == QSPI_CMD_FAST_READ ||
> -		    priv->cur_seqid == QSPI_CMD_RDAR) {
> -			priv->sf_addr = swab32(txbuf) & OFFSET_BITS_MASK;
> -		} else if ((priv->cur_seqid == QSPI_CMD_SE) ||
> -			   (priv->cur_seqid == QSPI_CMD_BE_4K)) {
> -			priv->sf_addr = swab32(txbuf) & OFFSET_BITS_MASK;
> -			qspi_op_erase(priv);
> -		} else if (priv->cur_seqid == QSPI_CMD_PP ||
> -			   priv->cur_seqid == QSPI_CMD_WRAR) {
> -			wr_sfaddr = swab32(txbuf) & OFFSET_BITS_MASK;
> -		} else if ((priv->cur_seqid == QSPI_CMD_BRWR) ||
> -			 (priv->cur_seqid == QSPI_CMD_WREAR)) {
> -#ifdef CONFIG_SPI_FLASH_BAR
> -			wr_sfaddr = 0;
> -#endif
> -		}
> -	}
> +	void __iomem *base = q->iobase;
> +	int i;
> +	u32 val;
>   
> -	if (din) {
> -		if (priv->cur_seqid == QSPI_CMD_FAST_READ) {
> -#ifdef CONFIG_SYS_FSL_QSPI_AHB
> -			qspi_ahb_read(priv, din, bytes);
> -#else
> -			qspi_op_read(priv, din, bytes);
> -#endif
> -		} else if (priv->cur_seqid == QSPI_CMD_RDAR) {
> -			qspi_op_read(priv, din, bytes);
> -		} else if (priv->cur_seqid == QSPI_CMD_RDID)
> -			qspi_op_rdid(priv, din, bytes);
> -		else if (priv->cur_seqid == QSPI_CMD_RDSR)
> -			qspi_op_rdsr(priv, din, bytes);
> -#ifdef CONFIG_SPI_FLASH_BAR
> -		else if ((priv->cur_seqid == QSPI_CMD_BRRD) ||
> -			 (priv->cur_seqid == QSPI_CMD_RDEAR)) {
> -			priv->sf_addr = 0;
> -			qspi_op_rdbank(priv, din, bytes);
> -		}
> -#endif
> +	for (i = 0; i < ALIGN_DOWN(op->data.nbytes, 4); i += 4) {
> +		memcpy(&val, op->data.buf.out + i, 4);
> +		val = fsl_qspi_endian_xchg(q, val);
> +		qspi_writel(q, val, base + QUADSPI_TBDR);
>   	}
>   
> -#ifdef CONFIG_SYS_FSL_QSPI_AHB
> -	if ((priv->cur_seqid == QSPI_CMD_SE) ||
> -	    (priv->cur_seqid == QSPI_CMD_PP) ||
> -	    (priv->cur_seqid == QSPI_CMD_BE_4K) ||
> -	    (priv->cur_seqid == QSPI_CMD_WREAR) ||
> -	    (priv->cur_seqid == QSPI_CMD_BRWR))
> -		qspi_ahb_invalid(priv);
> -#endif
> +	if (i < op->data.nbytes) {
> +		memcpy(&val, op->data.buf.out + i, op->data.nbytes - i);
> +		val = fsl_qspi_endian_xchg(q, val);
> +		qspi_writel(q, val, base + QUADSPI_TBDR);
> +	}
>   
> -	return 0;
> +	if (needs_fill_txfifo(q)) {
> +		for (i = op->data.nbytes; i < 16; i += 4)
> +			qspi_writel(q, 0, base + QUADSPI_TBDR);
> +	}
>   }
>   
> -void qspi_module_disable(struct fsl_qspi_priv *priv, u8 disable)
> +static void fsl_qspi_read_rxfifo(struct fsl_qspi *q,
> +				 const struct spi_mem_op *op)
>   {
> -	u32 mcr_val;
> +	void __iomem *base = q->iobase;
> +	int i;
> +	u8 *buf = op->data.buf.in;
> +	u32 val;
>   
> -	mcr_val = qspi_read32(priv->flags, &priv->regs->mcr);
> -	if (disable)
> -		mcr_val |= QSPI_MCR_MDIS_MASK;
> -	else
> -		mcr_val &= ~QSPI_MCR_MDIS_MASK;
> -	qspi_write32(priv->flags, &priv->regs->mcr, mcr_val);
> +	for (i = 0; i < ALIGN_DOWN(op->data.nbytes, 4); i += 4) {
> +		val = qspi_readl(q, base + QUADSPI_RBDR(i / 4));
> +		val = fsl_qspi_endian_xchg(q, val);
> +		memcpy(buf + i, &val, 4);
> +	}
> +
> +	if (i < op->data.nbytes) {
> +		val = qspi_readl(q, base + QUADSPI_RBDR(i / 4));
> +		val = fsl_qspi_endian_xchg(q, val);
> +		memcpy(buf + i, &val, op->data.nbytes - i);
> +	}
>   }
>   
> -void qspi_cfg_smpr(struct fsl_qspi_priv *priv, u32 clear_bits, u32 set_bits)
> +static int fsl_qspi_readl_poll_tout(struct fsl_qspi *q, void __iomem *base,
> +				    u32 mask, u32 delay_us, u32 timeout_us)
>   {
> -	u32 smpr_val;
> +	u32 reg;
> +
> +	if (!q->devtype_data->little_endian)
> +		mask = (u32)cpu_to_be32(mask);
>   
> -	smpr_val = qspi_read32(priv->flags, &priv->regs->smpr);
> -	smpr_val &= ~clear_bits;
> -	smpr_val |= set_bits;
> -	qspi_write32(priv->flags, &priv->regs->smpr, smpr_val);
> +	return readl_poll_timeout(base, reg, !(reg & mask), timeout_us);
>   }
>   
> -static int fsl_qspi_child_pre_probe(struct udevice *dev)
> +static int fsl_qspi_do_op(struct fsl_qspi *q, const struct spi_mem_op *op)
>   {
> -	struct spi_slave *slave = dev_get_parent_priv(dev);
> -	struct fsl_qspi_priv *priv = dev_get_priv(dev_get_parent(dev));
> +	void __iomem *base = q->iobase;
> +	int err = 0;
>   
> -	slave->max_write_size = priv->devtype_data->txfifo;
> +	/*
> +	 * Always start the sequence at the same index since we update
> +	 * the LUT at each exec_op() call. And also specify the DATA
> +	 * length, since it's has not been specified in the LUT.
> +	 */
> +	qspi_writel(q, op->data.nbytes | QUADSPI_IPCR_SEQID(SEQID_LUT),
> +		    base + QUADSPI_IPCR);
>   
> -	return 0;
> +	/* wait for the controller being ready */
> +	err = fsl_qspi_readl_poll_tout(q, base + QUADSPI_SR, (QUADSPI_SR_IP_ACC_MASK |
> +				 QUADSPI_SR_AHB_ACC_MASK), 10, 1000);
> +
> +	if (!err && op->data.nbytes && op->data.dir == SPI_MEM_DATA_IN)
> +		fsl_qspi_read_rxfifo(q, op);
> +
> +	return err;
>   }
>   
> -static int fsl_qspi_probe(struct udevice *bus)
> +static int fsl_qspi_exec_op(struct spi_slave *slave,
> +			    const struct spi_mem_op *op)
>   {
> -	u32 amba_size_per_chip;
> -	struct fsl_qspi_platdata *plat = dev_get_platdata(bus);
> -	struct fsl_qspi_priv *priv = dev_get_priv(bus);
> -	struct dm_spi_bus *dm_spi_bus;
> -	int i, ret;
> +	struct fsl_qspi *q = dev_get_priv(slave->dev->parent);
> +	void __iomem *base = q->iobase;
> +	u32 addr_offset = 0;
> +	int err = 0;
> +
> +	/* wait for the controller being ready */
> +	fsl_qspi_readl_poll_tout(q, base + QUADSPI_SR, (QUADSPI_SR_IP_ACC_MASK |
> +				 QUADSPI_SR_AHB_ACC_MASK), 10, 1000);
>   
> -	dm_spi_bus = bus->uclass_priv;
> +	fsl_qspi_select_mem(q, slave);
>   
> -	dm_spi_bus->max_hz = plat->speed_hz;
> +	if (needs_amba_base_offset(q))
> +		addr_offset = q->memmap_phy;
>   
> -	priv->regs = (struct fsl_qspi_regs *)(uintptr_t)plat->reg_base;
> -	priv->flags = plat->flags;
> +	qspi_writel(q,
> +		    q->selected * q->devtype_data->ahb_buf_size + addr_offset,
> +		    base + QUADSPI_SFAR);
> +
> +	qspi_writel(q, qspi_readl(q, base + QUADSPI_MCR) |
> +		    QUADSPI_MCR_CLR_RXF_MASK | QUADSPI_MCR_CLR_TXF_MASK,
> +		    base + QUADSPI_MCR);
> +
> +	qspi_writel(q, QUADSPI_SPTRCLR_BFPTRC | QUADSPI_SPTRCLR_IPPTRC,
> +		    base + QUADSPI_SPTRCLR);
> +
> +	fsl_qspi_prepare_lut(q, op);
>   
> -	priv->speed_hz = plat->speed_hz;
>   	/*
> -	 * QSPI SFADR width is 32bits, the max dest addr is 4GB-1.
> -	 * AMBA memory zone should be located on the 0~4GB space
> -	 * even on a 64bits cpu.
> +	 * If we have large chunks of data, we read them through the AHB bus
> +	 * by accessing the mapped memory. In all other cases we use
> +	 * IP commands to access the flash.
>   	 */
> -	priv->amba_base[0] = (u32)plat->amba_base;
> -	priv->amba_total_size = (u32)plat->amba_total_size;
> -	priv->flash_num = plat->flash_num;
> -	priv->num_chipselect = plat->num_chipselect;
> -
> -	priv->devtype_data = (struct fsl_qspi_devtype_data *)dev_get_driver_data(bus);
> -	if (!priv->devtype_data) {
> -		printf("ERROR : No devtype_data found\n");
> -		return -ENODEV;
> +	if (op->data.nbytes > (q->devtype_data->rxfifo - 4) &&
> +	    op->data.dir == SPI_MEM_DATA_IN) {
> +		fsl_qspi_read_ahb(q, op);
> +	} else {
> +		qspi_writel(q, QUADSPI_RBCT_WMRK_MASK |
> +			    QUADSPI_RBCT_RXBRD_USEIPS, base + QUADSPI_RBCT);
> +
> +		if (op->data.nbytes && op->data.dir == SPI_MEM_DATA_OUT)
> +			fsl_qspi_fill_txfifo(q, op);
> +
> +		err = fsl_qspi_do_op(q, op);
>   	}
>   
> -	debug("devtype=%d, txfifo=%d, rxfifo=%d, ahb=%d, data=0x%x\n",
> -		priv->devtype_data->devtype,
> -		priv->devtype_data->txfifo,
> -		priv->devtype_data->rxfifo,
> -		priv->devtype_data->ahb_buf_size,
> -		priv->devtype_data->driver_data);
> +	/* Invalidate the data in the AHB buffer. */
> +	fsl_qspi_invalidate(q);
>   
> -	/* make sure controller is not busy anywhere */
> -	ret = is_controller_busy(priv);
> +	return err;
> +}
>   
> -	if (ret) {
> -		debug("ERROR : The controller is busy\n");
> -		return ret;
> +static int fsl_qspi_adjust_op_size(struct spi_slave *slave,
> +				   struct spi_mem_op *op)
> +{
> +	struct fsl_qspi *q = dev_get_priv(slave->dev->parent);
> +
> +	if (op->data.dir == SPI_MEM_DATA_OUT) {
> +		if (op->data.nbytes > q->devtype_data->txfifo)
> +			op->data.nbytes = q->devtype_data->txfifo;
> +	} else {
> +		if (op->data.nbytes > q->devtype_data->ahb_buf_size)
> +			op->data.nbytes = q->devtype_data->ahb_buf_size;
> +		else if (op->data.nbytes > (q->devtype_data->rxfifo - 4))
> +			op->data.nbytes = ALIGN_DOWN(op->data.nbytes, 8);
>   	}
>   
> -	qspi_write32(priv->flags, &priv->regs->mcr,
> -		     QSPI_MCR_RESERVED_MASK | QSPI_MCR_MDIS_MASK |
> -		     QSPI_MCR_END_CFD_LE);
> +	return 0;
> +}
>   
> -	qspi_cfg_smpr(priv, ~(QSPI_SMPR_FSDLY_MASK | QSPI_SMPR_DDRSMP_MASK |
> -		QSPI_SMPR_FSPHS_MASK | QSPI_SMPR_HSENA_MASK), 0);
> +static int fsl_qspi_default_setup(struct fsl_qspi *q)
> +{
> +	void __iomem *base = q->iobase;
> +	u32 reg, addr_offset = 0;
> +
> +	/* Reset the module */
> +	qspi_writel(q, QUADSPI_MCR_SWRSTSD_MASK | QUADSPI_MCR_SWRSTHD_MASK,
> +		    base + QUADSPI_MCR);
> +	udelay(1);
> +
> +	/* Disable the module */
> +	qspi_writel(q, QUADSPI_MCR_MDIS_MASK | QUADSPI_MCR_RESERVED_MASK,
> +		    base + QUADSPI_MCR);
>   
>   	/*
> -	 * Assign AMBA memory zone for every chipselect
> -	 * QuadSPI has two channels, every channel has two chipselects.
> -	 * If the property 'num-cs' in dts is 2, the AMBA memory will be divided
> -	 * into two parts and assign to every channel. This indicate that every
> -	 * channel only has one valid chipselect.
> -	 * If the property 'num-cs' in dts is 4, the AMBA memory will be divided
> -	 * into four parts and assign to every chipselect.
> -	 * Every channel will has two valid chipselects.
> +	 * Previous boot stages (BootROM, bootloader) might have used DDR
> +	 * mode and did not clear the TDH bits. As we currently use SDR mode
> +	 * only, clear the TDH bits if necessary.
>   	 */
> -	amba_size_per_chip = priv->amba_total_size >>
> -			     (priv->num_chipselect >> 1);
> -	for (i = 1 ; i < priv->num_chipselect ; i++)
> -		priv->amba_base[i] =
> -			amba_size_per_chip + priv->amba_base[i - 1];
> +	if (needs_tdh_setting(q))
> +		qspi_writel(q, qspi_readl(q, base + QUADSPI_FLSHCR) &
> +			    ~QUADSPI_FLSHCR_TDH_MASK,
> +			    base + QUADSPI_FLSHCR);
> +
> +	reg = qspi_readl(q, base + QUADSPI_SMPR);
> +	qspi_writel(q, reg & ~(QUADSPI_SMPR_FSDLY_MASK
> +			| QUADSPI_SMPR_FSPHS_MASK
> +			| QUADSPI_SMPR_HSENA_MASK
> +			| QUADSPI_SMPR_DDRSMP_MASK), base + QUADSPI_SMPR);
> +
> +	/* We only use the buffer3 for AHB read */
> +	qspi_writel(q, 0, base + QUADSPI_BUF0IND);
> +	qspi_writel(q, 0, base + QUADSPI_BUF1IND);
> +	qspi_writel(q, 0, base + QUADSPI_BUF2IND);
> +
> +	qspi_writel(q, QUADSPI_BFGENCR_SEQID(SEQID_LUT),
> +		    q->iobase + QUADSPI_BFGENCR);
> +	qspi_writel(q, QUADSPI_RBCT_WMRK_MASK, base + QUADSPI_RBCT);
> +	qspi_writel(q, QUADSPI_BUF3CR_ALLMST_MASK |
> +		    QUADSPI_BUF3CR_ADATSZ(q->devtype_data->ahb_buf_size / 8),
> +		    base + QUADSPI_BUF3CR);
> +
> +	if (needs_amba_base_offset(q))
> +		addr_offset = q->memmap_phy;
>   
>   	/*
> -	 * Any read access to non-implemented addresses will provide
> -	 * undefined results.
> -	 *
> -	 * In case single die flash devices, TOP_ADDR_MEMA2 and
> -	 * TOP_ADDR_MEMB2 should be initialized/programmed to
> -	 * TOP_ADDR_MEMA1 and TOP_ADDR_MEMB1 respectively - in effect,
> -	 * setting the size of these devices to 0.  This would ensure
> -	 * that the complete memory map is assigned to only one flash device.
> +	 * In HW there can be a maximum of four chips on two buses with
> +	 * two chip selects on each bus. We use four chip selects in SW
> +	 * to differentiate between the four chips.
> +	 * We use ahb_buf_size for each chip and set SFA1AD, SFA2AD, SFB1AD,
> +	 * SFB2AD accordingly.
>   	 */
> -	qspi_write32(priv->flags, &priv->regs->sfa1ad,
> -		     priv->amba_base[0] + amba_size_per_chip);
> -	switch (priv->num_chipselect) {
> -	case 1:
> -		break;
> -	case 2:
> -		qspi_write32(priv->flags, &priv->regs->sfa2ad,
> -			     priv->amba_base[1]);
> -		qspi_write32(priv->flags, &priv->regs->sfb1ad,
> -			     priv->amba_base[1] + amba_size_per_chip);
> -		qspi_write32(priv->flags, &priv->regs->sfb2ad,
> -			     priv->amba_base[1] + amba_size_per_chip);
> -		break;
> -	case 4:
> -		qspi_write32(priv->flags, &priv->regs->sfa2ad,
> -			     priv->amba_base[2]);
> -		qspi_write32(priv->flags, &priv->regs->sfb1ad,
> -			     priv->amba_base[3]);
> -		qspi_write32(priv->flags, &priv->regs->sfb2ad,
> -			     priv->amba_base[3] + amba_size_per_chip);
> -		break;
> -	default:
> -		debug("Error: Unsupported chipselect number %u!\n",
> -		      priv->num_chipselect);
> -		qspi_module_disable(priv, 1);
> -		return -EINVAL;
> -	}
> -
> -	qspi_set_lut(priv);
> -
> -#ifdef CONFIG_SYS_FSL_QSPI_AHB
> -	qspi_init_ahb_read(priv);
> -#endif
> -
> -	qspi_module_disable(priv, 0);
> -
> +	qspi_writel(q, q->devtype_data->ahb_buf_size + addr_offset,
> +		    base + QUADSPI_SFA1AD);
> +	qspi_writel(q, q->devtype_data->ahb_buf_size * 2 + addr_offset,
> +		    base + QUADSPI_SFA2AD);
> +	qspi_writel(q, q->devtype_data->ahb_buf_size * 3 + addr_offset,
> +		    base + QUADSPI_SFB1AD);
> +	qspi_writel(q, q->devtype_data->ahb_buf_size * 4 + addr_offset,
> +		    base + QUADSPI_SFB2AD);
> +
> +	q->selected = -1;
> +
> +	/* Enable the module */
> +	qspi_writel(q, QUADSPI_MCR_RESERVED_MASK | QUADSPI_MCR_END_CFG_MASK,
> +		    base + QUADSPI_MCR);
>   	return 0;
>   }
>   
> -static int fsl_qspi_ofdata_to_platdata(struct udevice *bus)
> +static const struct spi_controller_mem_ops fsl_qspi_mem_ops = {
> +	.adjust_op_size = fsl_qspi_adjust_op_size,
> +	.supports_op = fsl_qspi_supports_op,
> +	.exec_op = fsl_qspi_exec_op,
> +};
> +
> +static int fsl_qspi_probe(struct udevice *bus)
>   {
> -	struct fdt_resource res_regs, res_mem;
> -	struct fsl_qspi_platdata *plat = bus->platdata;
> +	struct dm_spi_bus *dm_bus = bus->uclass_priv;
> +	struct fsl_qspi *q = dev_get_priv(bus);
>   	const void *blob = gd->fdt_blob;
>   	int node = dev_of_offset(bus);
> -	int ret, flash_num = 0, subnode;
> +	struct fdt_resource res;
> +	int ret;
>   
> -	if (fdtdec_get_bool(blob, node, "big-endian"))
> -		plat->flags |= QSPI_FLAG_REGMAP_ENDIAN_BIG;
> +	q->devtype_data = (struct fsl_qspi_devtype_data *)
> +			   dev_get_driver_data(bus);
>   
> -	ret = fdt_get_named_resource(blob, node, "reg", "reg-names",
> -				     "QuadSPI", &res_regs);
> +	/* find the resources */
> +	ret = fdt_get_named_resource(blob, node, "reg", "reg-names", "QuadSPI",
> +				     &res);
>   	if (ret) {
> -		debug("Error: can't get regs base addresses(ret = %d)!\n", ret);
> +		dev_err(dev, "Can't get regs base addresses(ret = %d)!\n", ret);
>   		return -ENOMEM;
>   	}
> +
> +	q->iobase = map_physmem(res.start, res.end - res.start, MAP_NOCACHE);
> +
>   	ret = fdt_get_named_resource(blob, node, "reg", "reg-names",
> -				     "QuadSPI-memory", &res_mem);
> +				     "QuadSPI-memory", &res);
>   	if (ret) {
> -		debug("Error: can't get AMBA base addresses(ret = %d)!\n", ret);
> +		dev_err(dev, "Can't get AMBA base addresses(ret = %d)!\n", ret);
>   		return -ENOMEM;
>   	}
>   
> -	/* Count flash numbers */
> -	fdt_for_each_subnode(subnode, blob, node)
> -		++flash_num;
> +	q->ahb_addr = map_physmem(res.start, res.end - res.start, MAP_NOCACHE);
> +	q->memmap_phy = res.start;
>   
> -	if (flash_num == 0) {
> -		debug("Error: Missing flashes!\n");
> -		return -ENODEV;
> -	}
> +	dm_bus->max_hz = fdtdec_get_int(blob, node, "spi-max-frequency",
> +					66000000);
>   
> -	plat->speed_hz = fdtdec_get_int(blob, node, "spi-max-frequency",
> -					FSL_QSPI_DEFAULT_SCK_FREQ);
> -	plat->num_chipselect = fdtdec_get_int(blob, node, "num-cs",
> -					      FSL_QSPI_MAX_CHIPSELECT_NUM);
> -
> -	plat->reg_base = res_regs.start;
> -	plat->amba_base = res_mem.start;
> -	plat->amba_total_size = res_mem.end - res_mem.start + 1;
> -	plat->flash_num = flash_num;
> -
> -	debug("%s: regs=<0x%llx> <0x%llx, 0x%llx>, max-frequency=%d, endianess=%s\n",
> -	      __func__,
> -	      (u64)plat->reg_base,
> -	      (u64)plat->amba_base,
> -	      (u64)plat->amba_total_size,
> -	      plat->speed_hz,
> -	      plat->flags & QSPI_FLAG_REGMAP_ENDIAN_BIG ? "be" : "le"
> -	      );
> +	fsl_qspi_default_setup(q);
>   
>   	return 0;
>   }
>   
>   static int fsl_qspi_xfer(struct udevice *dev, unsigned int bitlen,
> -		const void *dout, void *din, unsigned long flags)
> +			 const void *dout, void *din, unsigned long flags)
>   {
> -	struct fsl_qspi_priv *priv;
> -	struct udevice *bus;
> -
> -	bus = dev->parent;
> -	priv = dev_get_priv(bus);
> -
> -	return qspi_xfer(priv, bitlen, dout, din, flags);
> +	return 0;
>   }
>   
>   static int fsl_qspi_claim_bus(struct udevice *dev)
>   {
> -	struct fsl_qspi_priv *priv;
> -	struct udevice *bus;
> -	struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev);
> -	int ret;
> -
> -	bus = dev->parent;
> -	priv = dev_get_priv(bus);
> -
> -	/* make sure controller is not busy anywhere */
> -	ret = is_controller_busy(priv);
> -
> -	if (ret) {
> -		debug("ERROR : The controller is busy\n");
> -		return ret;
> -	}
> -
> -	priv->cur_amba_base = priv->amba_base[slave_plat->cs];
> -
> -	qspi_module_disable(priv, 0);
> -
>   	return 0;
>   }
>   
>   static int fsl_qspi_release_bus(struct udevice *dev)
>   {
> -	struct fsl_qspi_priv *priv;
> -	struct udevice *bus;
> -
> -	bus = dev->parent;
> -	priv = dev_get_priv(bus);
> -
> -	qspi_module_disable(priv, 1);
> -
>   	return 0;
>   }
>   
>   static int fsl_qspi_set_speed(struct udevice *bus, uint speed)
>   {
> -	/* Nothing to do */
>   	return 0;
>   }
>   
>   static int fsl_qspi_set_mode(struct udevice *bus, uint mode)
>   {
> -	/* Nothing to do */
>   	return 0;
>   }
>   
> @@ -1146,14 +770,17 @@ static const struct dm_spi_ops fsl_qspi_ops = {
>   	.xfer		= fsl_qspi_xfer,
>   	.set_speed	= fsl_qspi_set_speed,
>   	.set_mode	= fsl_qspi_set_mode,
> +	.mem_ops	= &fsl_qspi_mem_ops,
>   };
>   
>   static const struct udevice_id fsl_qspi_ids[] = {
> -	{ .compatible = "fsl,vf610-qspi", .data = (ulong)&vybrid_data },
> -	{ .compatible = "fsl,imx6sx-qspi", .data = (ulong)&imx6sx_data },
> -	{ .compatible = "fsl,imx6ul-qspi", .data = (ulong)&imx6ul_7d_data },
> -	{ .compatible = "fsl,imx7d-qspi", .data = (ulong)&imx6ul_7d_data },
> -	{ .compatible = "fsl,imx7ulp-qspi", .data = (ulong)&imx7ulp_data },
> +	{ .compatible = "fsl,vf610-qspi", .data = (ulong)&vybrid_data, },
> +	{ .compatible = "fsl,imx6sx-qspi", .data = (ulong)&imx6sx_data, },
> +	{ .compatible = "fsl,imx6ul-qspi", .data = (ulong)&imx6ul_data, },
> +	{ .compatible = "fsl,imx7d-qspi", .data = (ulong)&imx7d_data, },
> +	{ .compatible = "fsl,ls1021a-qspi", .data = (ulong)&ls1021a_data, },
> +	{ .compatible = "fsl,ls1088a-qspi", .data = (ulong)&ls1088a_data, },
> +	{ .compatible = "fsl,ls2080a-qspi", .data = (ulong)&ls2080a_data, },
>   	{ }
>   };
>   
> @@ -1162,9 +789,6 @@ U_BOOT_DRIVER(fsl_qspi) = {
>   	.id	= UCLASS_SPI,
>   	.of_match = fsl_qspi_ids,
>   	.ops	= &fsl_qspi_ops,
> -	.ofdata_to_platdata = fsl_qspi_ofdata_to_platdata,
> -	.platdata_auto_alloc_size = sizeof(struct fsl_qspi_platdata),
> -	.priv_auto_alloc_size = sizeof(struct fsl_qspi_priv),
> +	.priv_auto_alloc_size = sizeof(struct fsl_qspi),
>   	.probe	= fsl_qspi_probe,
> -	.child_pre_probe = fsl_qspi_child_pre_probe,
>   };
> diff --git a/drivers/spi/fsl_qspi.h b/drivers/spi/fsl_qspi.h
> deleted file mode 100644
> index 9e61a852b5..0000000000
> --- a/drivers/spi/fsl_qspi.h
> +++ /dev/null
> @@ -1,145 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0+ */
> -/*
> - * Copyright 2013-2014 Freescale Semiconductor, Inc.
> - *
> - * Register definitions for Freescale QSPI
> - */
> -
> -#ifndef _FSL_QSPI_H_
> -#define _FSL_QSPI_H_
> -
> -struct fsl_qspi_regs {
> -	u32 mcr;
> -	u32 rsvd0[1];
> -	u32 ipcr;
> -	u32 flshcr;
> -	u32 buf0cr;
> -	u32 buf1cr;
> -	u32 buf2cr;
> -	u32 buf3cr;
> -	u32 bfgencr;
> -	u32 soccr;
> -	u32 rsvd1[2];
> -	u32 buf0ind;
> -	u32 buf1ind;
> -	u32 buf2ind;
> -	u32 rsvd2[49];
> -	u32 sfar;
> -	u32 rsvd3[1];
> -	u32 smpr;
> -	u32 rbsr;
> -	u32 rbct;
> -	u32 rsvd4[15];
> -	u32 tbsr;
> -	u32 tbdr;
> -	u32 rsvd5[1];
> -	u32 sr;
> -	u32 fr;
> -	u32 rser;
> -	u32 spndst;
> -	u32 sptrclr;
> -	u32 rsvd6[4];
> -	u32 sfa1ad;
> -	u32 sfa2ad;
> -	u32 sfb1ad;
> -	u32 sfb2ad;
> -	u32 rsvd7[28];
> -	u32 rbdr[32];
> -	u32 rsvd8[32];
> -	u32 lutkey;
> -	u32 lckcr;
> -	u32 rsvd9[2];
> -	u32 lut[64];
> -};
> -
> -#define QSPI_IPCR_SEQID_SHIFT		24
> -#define QSPI_IPCR_SEQID_MASK		(0xf << QSPI_IPCR_SEQID_SHIFT)
> -
> -#define QSPI_MCR_END_CFD_SHIFT		2
> -#define QSPI_MCR_END_CFD_MASK		(3 << QSPI_MCR_END_CFD_SHIFT)
> -#ifdef CONFIG_SYS_FSL_QSPI_AHB
> -/* AHB needs 64bit operation */
> -#define QSPI_MCR_END_CFD_LE		(3 << QSPI_MCR_END_CFD_SHIFT)
> -#else
> -#define QSPI_MCR_END_CFD_LE		(1 << QSPI_MCR_END_CFD_SHIFT)
> -#endif
> -#define QSPI_MCR_DDR_EN_SHIFT		7
> -#define QSPI_MCR_DDR_EN_MASK		(1 << QSPI_MCR_DDR_EN_SHIFT)
> -#define QSPI_MCR_CLR_RXF_SHIFT		10
> -#define QSPI_MCR_CLR_RXF_MASK		(1 << QSPI_MCR_CLR_RXF_SHIFT)
> -#define QSPI_MCR_CLR_TXF_SHIFT		11
> -#define QSPI_MCR_CLR_TXF_MASK		(1 << QSPI_MCR_CLR_TXF_SHIFT)
> -#define QSPI_MCR_MDIS_SHIFT		14
> -#define QSPI_MCR_MDIS_MASK		(1 << QSPI_MCR_MDIS_SHIFT)
> -#define QSPI_MCR_RESERVED_SHIFT		16
> -#define QSPI_MCR_RESERVED_MASK		(0xf << QSPI_MCR_RESERVED_SHIFT)
> -#define QSPI_MCR_SWRSTHD_SHIFT		1
> -#define QSPI_MCR_SWRSTHD_MASK		(1 << QSPI_MCR_SWRSTHD_SHIFT)
> -#define QSPI_MCR_SWRSTSD_SHIFT		0
> -#define QSPI_MCR_SWRSTSD_MASK		(1 << QSPI_MCR_SWRSTSD_SHIFT)
> -
> -#define QSPI_SMPR_HSENA_SHIFT		0
> -#define QSPI_SMPR_HSENA_MASK		(1 << QSPI_SMPR_HSENA_SHIFT)
> -#define QSPI_SMPR_FSPHS_SHIFT		5
> -#define QSPI_SMPR_FSPHS_MASK		(1 << QSPI_SMPR_FSPHS_SHIFT)
> -#define QSPI_SMPR_FSDLY_SHIFT		6
> -#define QSPI_SMPR_FSDLY_MASK		(1 << QSPI_SMPR_FSDLY_SHIFT)
> -#define QSPI_SMPR_DDRSMP_SHIFT		16
> -#define QSPI_SMPR_DDRSMP_MASK		(7 << QSPI_SMPR_DDRSMP_SHIFT)
> -
> -#define QSPI_BUFXCR_INVALID_MSTRID	0xe
> -#define QSPI_BUF3CR_ALLMST_SHIFT	31
> -#define QSPI_BUF3CR_ALLMST_MASK		(1 << QSPI_BUF3CR_ALLMST_SHIFT)
> -#define QSPI_BUF3CR_ADATSZ_SHIFT	8
> -#define QSPI_BUF3CR_ADATSZ_MASK		(0xFF << QSPI_BUF3CR_ADATSZ_SHIFT)
> -
> -#define QSPI_BFGENCR_SEQID_SHIFT	12
> -#define QSPI_BFGENCR_SEQID_MASK		(0xf << QSPI_BFGENCR_SEQID_SHIFT)
> -#define QSPI_BFGENCR_PAR_EN_SHIFT	16
> -#define QSPI_BFGENCR_PAR_EN_MASK	(1 << QSPI_BFGENCR_PAR_EN_SHIFT)
> -
> -#define QSPI_RBSR_RDBFL_SHIFT		8
> -#define QSPI_RBSR_RDBFL_MASK		(0x3f << QSPI_RBSR_RDBFL_SHIFT)
> -
> -#define QSPI_RBCT_RXBRD_SHIFT		8
> -#define QSPI_RBCT_RXBRD_USEIPS		(1 << QSPI_RBCT_RXBRD_SHIFT)
> -
> -#define QSPI_SR_AHB_ACC_SHIFT		2
> -#define QSPI_SR_AHB_ACC_MASK		(1 << QSPI_SR_AHB_ACC_SHIFT)
> -#define QSPI_SR_IP_ACC_SHIFT		1
> -#define QSPI_SR_IP_ACC_MASK		(1 << QSPI_SR_IP_ACC_SHIFT)
> -#define QSPI_SR_BUSY_SHIFT		0
> -#define QSPI_SR_BUSY_MASK		(1 << QSPI_SR_BUSY_SHIFT)
> -
> -#define QSPI_LCKCR_LOCK			0x1
> -#define QSPI_LCKCR_UNLOCK		0x2
> -
> -#define LUT_KEY_VALUE			0x5af05af0
> -
> -#define OPRND0_SHIFT			0
> -#define OPRND0(x)			((x) << OPRND0_SHIFT)
> -#define PAD0_SHIFT			8
> -#define PAD0(x)				((x) << PAD0_SHIFT)
> -#define INSTR0_SHIFT			10
> -#define INSTR0(x)			((x) << INSTR0_SHIFT)
> -#define OPRND1_SHIFT			16
> -#define OPRND1(x)			((x) << OPRND1_SHIFT)
> -#define PAD1_SHIFT			24
> -#define PAD1(x)				((x) << PAD1_SHIFT)
> -#define INSTR1_SHIFT			26
> -#define INSTR1(x)			((x) << INSTR1_SHIFT)
> -
> -#define LUT_CMD				1
> -#define LUT_ADDR			2
> -#define LUT_DUMMY			3
> -#define LUT_READ			7
> -#define LUT_WRITE			8
> -
> -#define LUT_PAD1			0
> -#define LUT_PAD2			1
> -#define LUT_PAD4			2
> -
> -#define ADDR24BIT			0x18
> -#define ADDR32BIT			0x20
> -
> -#endif /* _FSL_QSPI_H_ */
> 

Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de

[Patch v2 2/7] treewide: Remove unused FSL QSPI config options

[Kuldeep Singh]

Some of these options are not used by the driver anymore and some of
them are obsolete as the information is gathered from the dt.
Also consolidating defines in common headers.

Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de>
Signed-off-by: Ashish Kumar <Ashish.Kumar@nxp.com>
Signed-off-by: Kuldeep Singh <kuldeep.singh@nxp.com>
---
 .../include/asm/arch-fsl-layerscape/config.h   |  1 -
 arch/arm/include/asm/arch-ls102xa/config.h     |  1 -
 include/configs/ls1012a_common.h               | 17 +----------------
 include/configs/ls1012afrwy.h                  |  3 ---
 include/configs/ls1012ardb.h                   |  3 ---
 include/configs/ls1021aiot.h                   |  6 ------
 include/configs/ls1021aqds.h                   | 11 -----------
 include/configs/ls1021atwr.h                   | 10 ----------
 include/configs/ls1043aqds.h                   |  2 --
 include/configs/ls1046afrwy.h                  |  9 ---------
 include/configs/ls1046aqds.h                   | 11 -----------
 include/configs/ls1046ardb.h                   | 13 -------------
 include/configs/ls1088a_common.h               |  6 ------
 include/configs/ls1088aqds.h                   |  8 --------
 include/configs/ls1088ardb.h                   | 18 ------------------
 include/configs/ls2080aqds.h                   |  2 --
 include/configs/ls2080ardb.h                   |  8 ++------
 include/configs/mx6sxsabreauto.h               |  6 ------
 include/configs/mx6sxsabresd.h                 | 11 -----------
 include/configs/mx6ul_14x14_evk.h              |  6 ------
 include/configs/mx6ullevk.h                    |  6 ------
 include/configs/mx7dsabresd.h                  |  8 --------
 include/configs/pcm052.h                       |  7 -------
 include/configs/vf610twr.h                     |  8 --------
 scripts/config_whitelist.txt                   |  5 -----
 25 files changed, 3 insertions(+), 183 deletions(-)

diff --git a/arch/arm/include/asm/arch-fsl-layerscape/config.h b/arch/arm/include/asm/arch-fsl-layerscape/config.h
index a83c70ece2..913f7b179f 100644
--- a/arch/arm/include/asm/arch-fsl-layerscape/config.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/config.h
@@ -304,7 +304,6 @@
 #define CONFIG_SYS_FSL_ESDHC_BE
 #define CONFIG_SYS_FSL_WDOG_BE
 #define CONFIG_SYS_FSL_DSPI_BE
-#define CONFIG_SYS_FSL_QSPI_BE
 #define CONFIG_SYS_FSL_CCSR_GUR_BE
 #define CONFIG_SYS_FSL_PEX_LUT_BE
 
diff --git a/arch/arm/include/asm/arch-ls102xa/config.h b/arch/arm/include/asm/arch-ls102xa/config.h
index 970537870d..3884948a2c 100644
--- a/arch/arm/include/asm/arch-ls102xa/config.h
+++ b/arch/arm/include/asm/arch-ls102xa/config.h
@@ -94,7 +94,6 @@
 #define CONFIG_SYS_FSL_ESDHC_BE
 #define CONFIG_SYS_FSL_WDOG_BE
 #define CONFIG_SYS_FSL_DSPI_BE
-#define CONFIG_SYS_FSL_QSPI_BE
 #define CONFIG_SYS_FSL_DCU_BE
 #define CONFIG_SYS_FSL_SEC_MON_LE
 #define CONFIG_SYS_FSL_SFP_VER_3_2
diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h
index 2579e2fb37..efd0ee41b6 100644
--- a/include/configs/ls1012a_common.h
+++ b/include/configs/ls1012a_common.h
@@ -37,23 +37,8 @@
 #define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 128 * 1024)
 
 /*SPI device */
-#if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_TFABOOT)
 #define CONFIG_SYS_FMAN_FW_ADDR		0x400d0000
-#define CONFIG_SPI_FLASH_SPANSION
-#define CONFIG_FSL_SPI_INTERFACE
-#define CONFIG_SF_DATAFLASH
-
-#define QSPI0_AMBA_BASE		0x40000000
-#define CONFIG_SPI_FLASH_SPANSION
-
-#define FSL_QSPI_FLASH_SIZE		SZ_64M
-#define FSL_QSPI_FLASH_NUM		2
-
-/*
- * Environment
- */
-#define CONFIG_ENV_OVERWRITE
-#endif
+#define CONFIG_SYS_FSL_QSPI_BASE	0x40000000
 
 /* SATA */
 #define CONFIG_SCSI_AHCI_PLAT
diff --git a/include/configs/ls1012afrwy.h b/include/configs/ls1012afrwy.h
index c0519e3c11..0496b516d3 100644
--- a/include/configs/ls1012afrwy.h
+++ b/include/configs/ls1012afrwy.h
@@ -33,9 +33,6 @@
 	func(USB, usb, 0)
 #endif
 
-#undef FSL_QSPI_FLASH_SIZE
-#define FSL_QSPI_FLASH_SIZE            SZ_16M
-
 /*  MMC  */
 #ifdef CONFIG_MMC
 #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h
index 0341495dfb..9ca28592eb 100644
--- a/include/configs/ls1012ardb.h
+++ b/include/configs/ls1012ardb.h
@@ -16,9 +16,6 @@
 #define CONFIG_SYS_MEMTEST_START	0x80000000
 #define CONFIG_SYS_MEMTEST_END		0x9fffffff
 
-
-/* ENV */
-#define CONFIG_SYS_FSL_QSPI_BASE	0x40000000
 /*
  * I2C IO expander
  */
diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h
index 0b2d331b9b..236a8d5f7c 100644
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -131,12 +131,6 @@
 /* SPI */
 #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)
 #define CONFIG_SPI_FLASH_SPANSION
-
-/* QSPI */
-#define QSPI0_AMBA_BASE			0x40000000
-#define FSL_QSPI_FLASH_SIZE		(1 << 24)
-#define FSL_QSPI_FLASH_NUM		2
-#define CONFIG_SPI_FLASH_SPANSION
 #endif
 
 /* DM SPI */
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 8427be5adc..d5e55a89a7 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -357,20 +357,9 @@ unsigned long get_board_ddr_clk(void);
  * MMC
  */
 
-/* SPI */
-#if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)
-/* QSPI */
-#define QSPI0_AMBA_BASE			0x40000000
-#define FSL_QSPI_FLASH_SIZE		(1 << 24)
-#define FSL_QSPI_FLASH_NUM		2
-
-/* DSPI */
-
 /* DM SPI */
 #if defined(CONFIG_FSL_DSPI) || defined(CONFIG_FSL_QSPI)
 #define CONFIG_DM_SPI_FLASH
-#define CONFIG_SPI_FLASH_DATAFLASH
-#endif
 #endif
 
 /*
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 1919d1e14f..4a0cf24ef4 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -228,16 +228,6 @@
  * MMC
  */
 
-/* SPI */
-#if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)
-/* QSPI */
-#define QSPI0_AMBA_BASE			0x40000000
-#define FSL_QSPI_FLASH_SIZE		(1 << 24)
-#define FSL_QSPI_FLASH_NUM		2
-
-/* DSPI */
-#endif
-
 /* DM SPI */
 #if defined(CONFIG_FSL_DSPI) || defined(CONFIG_FSL_QSPI)
 #define CONFIG_DM_SPI_FLASH
diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h
index 37080629a1..063e724b7c 100644
--- a/include/configs/ls1043aqds.h
+++ b/include/configs/ls1043aqds.h
@@ -384,8 +384,6 @@ unsigned long get_board_ddr_clk(void);
 	(defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI))
 #ifdef CONFIG_FSL_QSPI
 #define CONFIG_SPI_FLASH_SPANSION
-#define FSL_QSPI_FLASH_SIZE		(1 << 24)
-#define FSL_QSPI_FLASH_NUM		2
 #endif
 #endif
 
diff --git a/include/configs/ls1046afrwy.h b/include/configs/ls1046afrwy.h
index 4ccd3b0560..88d06ce7e4 100644
--- a/include/configs/ls1046afrwy.h
+++ b/include/configs/ls1046afrwy.h
@@ -96,10 +96,7 @@
 /*
  * Environment
  */
-#define CONFIG_ENV_OVERWRITE
-
 #define CONFIG_SYS_MMC_ENV_DEV		0
-
 #define CONFIG_SYS_FSL_QSPI_BASE	0x40000000
 
 /* FMan */
@@ -117,12 +114,6 @@
 
 #endif
 
-/* QSPI device */
-#ifdef CONFIG_FSL_QSPI
-#define FSL_QSPI_FLASH_SIZE		SZ_64M
-#define FSL_QSPI_FLASH_NUM		1
-#endif
-
 #undef CONFIG_BOOTCOMMAND
 #define QSPI_NOR_BOOTCOMMAND "run distro_bootcmd; run qspi_bootcmd; "	\
 			   "env exists secureboot && esbc_halt;;"
diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h
index 0b17b1e994..437b6ac5e3 100644
--- a/include/configs/ls1046aqds.h
+++ b/include/configs/ls1046aqds.h
@@ -46,8 +46,6 @@ unsigned long get_board_ddr_clk(void);
 	defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)
 #ifdef CONFIG_FSL_QSPI
 #define CONFIG_SPI_FLASH_SPANSION
-#define FSL_QSPI_FLASH_SIZE		(1 << 24)
-#define FSL_QSPI_FLASH_NUM		2
 #endif
 #endif
 
@@ -425,16 +423,7 @@ unsigned long get_board_ddr_clk(void);
 /*
  * Environment
  */
-#define CONFIG_ENV_OVERWRITE
-
-#ifdef CONFIG_TFABOOT
 #define CONFIG_SYS_MMC_ENV_DEV		0
-#else
-#ifdef CONFIG_NAND_BOOT
-#elif defined(CONFIG_SD_BOOT)
-#define CONFIG_SYS_MMC_ENV_DEV		0
-#endif
-#endif
 
 #define CONFIG_CMDLINE_TAG
 
diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h
index efedfd5923..61a4a40d60 100644
--- a/include/configs/ls1046ardb.h
+++ b/include/configs/ls1046ardb.h
@@ -153,19 +153,8 @@
 /*
  * Environment
  */
-#ifndef SPL_NO_ENV
-#define CONFIG_ENV_OVERWRITE
-#endif
-
-#ifdef CONFIG_TFABOOT
 #define CONFIG_SYS_MMC_ENV_DEV		0
-
 #define CONFIG_SYS_FSL_QSPI_BASE        0x40000000
-#else
-#if defined(CONFIG_SD_BOOT)
-#define CONFIG_SYS_MMC_ENV_DEV		0
-#endif
-#endif
 
 #define AQR105_IRQ_MASK			0x80000000
 /* FMan */
@@ -195,8 +184,6 @@
 #ifndef SPL_NO_QSPI
 #ifdef CONFIG_FSL_QSPI
 #define CONFIG_SPI_FLASH_SPANSION
-#define FSL_QSPI_FLASH_SIZE		(1 << 26)
-#define FSL_QSPI_FLASH_NUM		2
 #endif
 #endif
 
diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h
index ab5b396e1a..a7373429ba 100644
--- a/include/configs/ls1088a_common.h
+++ b/include/configs/ls1088a_common.h
@@ -35,13 +35,7 @@
 #endif
 
 /* Link Definitions */
-#ifdef CONFIG_TFABOOT
-#define CONFIG_SYS_FSL_QSPI_BASE	0x20000000
-#else
-#ifdef CONFIG_QSPI_BOOT
 #define CONFIG_SYS_FSL_QSPI_BASE	0x20000000
-#endif
-#endif
 
 #define CONFIG_SKIP_LOWLEVEL_INIT
 
diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h
index a5125c8f37..95569356d6 100644
--- a/include/configs/ls1088aqds.h
+++ b/include/configs/ls1088aqds.h
@@ -358,14 +358,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS	3
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS	5
 
-/* QSPI device */
-#if defined(CONFIG_TFABOOT) || \
-	defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)
-#define FSL_QSPI_FLASH_SIZE		(1 << 26)
-#define FSL_QSPI_FLASH_NUM		2
-
-#endif
-
 #ifdef CONFIG_FSL_DSPI
 #define CONFIG_SPI_FLASH_STMICRO
 #define CONFIG_SPI_FLASH_SST
diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h
index b082d8549a..51e85a6ee3 100644
--- a/include/configs/ls1088ardb.h
+++ b/include/configs/ls1088ardb.h
@@ -8,16 +8,7 @@
 
 #include "ls1088a_common.h"
 
-#ifdef CONFIG_TFABOOT
 #define CONFIG_SYS_MMC_ENV_DEV		0
-#else
-#if defined(CONFIG_QSPI_BOOT)
-#elif defined(CONFIG_SD_BOOT)
-#define CONFIG_SYS_MMC_ENV_DEV		0
-#else
-#define CONFIG_ENV_IS_IN_FLASH
-#endif
-#endif /* CONFIG_TFABOOT */
 
 #if defined(CONFIG_TFABOOT) || \
 	defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)
@@ -268,15 +259,6 @@
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS	3
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS	5
 
-#ifndef SPL_NO_QSPI
-/* QSPI device */
-#if defined(CONFIG_TFABOOT) || \
-	defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)
-#define FSL_QSPI_FLASH_SIZE		(1 << 26)
-#define FSL_QSPI_FLASH_NUM		2
-#endif
-#endif
-
 #define CONFIG_CMD_MEMINFO
 #define CONFIG_SYS_MEMTEST_START	0x80000000
 #define CONFIG_SYS_MEMTEST_END		0x9fffffff
diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h
index 9539e2a8db..e4b4be3279 100644
--- a/include/configs/ls2080aqds.h
+++ b/include/configs/ls2080aqds.h
@@ -285,8 +285,6 @@ unsigned long get_board_ddr_clk(void);
 
 #ifdef CONFIG_FSL_QSPI
 #define CONFIG_SPI_FLASH_SPANSION
-#define FSL_QSPI_FLASH_SIZE		(1 << 26) /* 64MB */
-#define FSL_QSPI_FLASH_NUM		4
 #endif
 /*
  * Verify QSPI when boot from NAND, QIXIS brdcfg9 need configure.
diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
index b251c795b0..8e0628cea0 100644
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@@ -70,7 +70,7 @@ unsigned long get_board_sys_clk(void);
 #define CONFIG_SYS_SCSI_MAX_LUN			1
 #define CONFIG_SYS_SCSI_MAX_DEVICE		(CONFIG_SYS_SCSI_MAX_SCSI_ID * \
 						CONFIG_SYS_SCSI_MAX_LUN)
-#ifdef CONFIG_TFABOOT
+#if defined(CONFIG_TFABOOT)
 #define CONFIG_SYS_MMC_ENV_DEV         0
 #endif
 
@@ -273,13 +273,9 @@ unsigned long get_board_sys_clk(void);
 #define I2C_MUX_CH_DEFAULT      0x8
 
 /* SPI */
-#if defined(CONFIG_FSL_QSPI) || defined(CONFIG_FSL_DSPI)
-#ifdef CONFIG_FSL_DSPI
+#if defined(CONFIG_FSL_DSPI)
 #define CONFIG_SPI_FLASH_STMICRO
 #endif
-#define FSL_QSPI_FLASH_SIZE		SZ_64M	/* 64MB */
-#define FSL_QSPI_FLASH_NUM		2
-#endif
 
 /*
  * RTC configuration
diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h
index 0bcf031953..16a451194d 100644
--- a/include/configs/mx6sxsabreauto.h
+++ b/include/configs/mx6sxsabreauto.h
@@ -145,12 +145,6 @@
 
 #define CONFIG_IMX_THERMAL
 
-#ifdef CONFIG_FSL_QSPI
-#define CONFIG_SYS_FSL_QSPI_AHB
-#define FSL_QSPI_FLASH_SIZE		SZ_32M
-#define FSL_QSPI_FLASH_NUM		2
-#endif
-
 #define CONFIG_SYS_FSL_USDHC_NUM	2
 #if defined(CONFIG_ENV_IS_IN_MMC)
 #define CONFIG_SYS_MMC_ENV_DEV		0  /*USDHC3*/
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index 704d9f3dcb..553814dcfd 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -175,17 +175,6 @@
 
 #define CONFIG_IMX_THERMAL
 
-#ifdef CONFIG_FSL_QSPI
-#define CONFIG_SYS_FSL_QSPI_LE
-#define CONFIG_SYS_FSL_QSPI_AHB
-#ifdef CONFIG_MX6SX_SABRESD_REVA
-#define FSL_QSPI_FLASH_SIZE		SZ_16M
-#else
-#define FSL_QSPI_FLASH_SIZE		SZ_32M
-#endif
-#define FSL_QSPI_FLASH_NUM		2
-#endif
-
 #ifndef CONFIG_SPL_BUILD
 #ifdef CONFIG_VIDEO
 #define CONFIG_VIDEO_MXS
diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index c21d633ca0..4dcd18140f 100644
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -161,12 +161,6 @@
 #define CONFIG_SYS_MMC_ENV_PART		0	/* user area */
 #define CONFIG_MMCROOT			"/dev/mmcblk1p2"  /* USDHC2 */
 
-#ifdef CONFIG_FSL_QSPI
-#define CONFIG_SYS_FSL_QSPI_AHB
-#define FSL_QSPI_FLASH_NUM		1
-#define FSL_QSPI_FLASH_SIZE		SZ_32M
-#endif
-
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h
index 7cce911314..425f391b86 100644
--- a/include/configs/mx6ullevk.h
+++ b/include/configs/mx6ullevk.h
@@ -160,10 +160,4 @@
 
 #define CONFIG_SOFT_SPI
 
-#ifdef CONFIG_FSL_QSPI
-#define CONFIG_SYS_FSL_QSPI_AHB
-#define FSL_QSPI_FLASH_NUM		1
-#define FSL_QSPI_FLASH_SIZE		SZ_32M
-#endif
-
 #endif
diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index 745507571d..54d1ef62de 100644
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -216,12 +216,4 @@
 #define CONFIG_VIDEO_BMP_LOGO
 #endif
 
-#ifdef CONFIG_FSL_QSPI
-#define CONFIG_SYS_FSL_QSPI_AHB
-#define FSL_QSPI_FLASH_NUM		1
-#define FSL_QSPI_FLASH_SIZE		SZ_64M
-#define QSPI0_BASE_ADDR			QSPI1_IPS_BASE_ADDR
-#define QSPI0_AMBA_BASE			QSPI0_ARB_BASE_ADDR
-#endif
-
 #endif	/* __CONFIG_H */
diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h
index 72f8d08a66..d4d6ad2143 100644
--- a/include/configs/pcm052.h
+++ b/include/configs/pcm052.h
@@ -26,13 +26,6 @@
 #define CONFIG_SYS_NAND_ONFI_DETECTION
 
 #define CONFIG_SYS_MAX_NAND_DEVICE	1
-/* QSPI Configs*/
-#ifdef CONFIG_FSL_QSPI
-#define FSL_QSPI_FLASH_SIZE		(SZ_16M)
-#define FSL_QSPI_FLASH_NUM		2
-#define CONFIG_SYS_FSL_QSPI_LE
-#endif
-
 
 #define CONFIG_LOADADDR			0x82000000
 
diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
index 3ab3231943..d52a5a7e83 100644
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@@ -43,14 +43,6 @@
 #define CONFIG_FEC_XCV_TYPE		RMII
 #define CONFIG_FEC_MXC_PHYADDR          0
 
-/* QSPI Configs*/
-
-#ifdef CONFIG_FSL_QSPI
-#define FSL_QSPI_FLASH_SIZE		(1 << 24)
-#define FSL_QSPI_FLASH_NUM		2
-#define CONFIG_SYS_FSL_QSPI_LE
-#endif
-
 /* I2C Configs */
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_I2C_MXC
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index cf1808e051..b5d4980f47 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -597,7 +597,6 @@ CONFIG_FSL_SERDES
 CONFIG_FSL_SERDES1
 CONFIG_FSL_SERDES2
 CONFIG_FSL_SGMII_RISER
-CONFIG_FSL_SPI_INTERFACE
 CONFIG_FSL_TBCLK_EXTRA_DIV
 CONFIG_FSL_TRUST_ARCH_v1
 CONFIG_FSL_VIA
@@ -1549,7 +1548,6 @@ CONFIG_SET_BOOTARGS
 CONFIG_SET_DFU_ALT_BUF_LEN
 CONFIG_SET_DFU_ALT_INFO
 CONFIG_SFIO
-CONFIG_SF_DATAFLASH
 CONFIG_SGI_IP28
 CONFIG_SH4_PCI
 CONFIG_SH73A0
@@ -2611,12 +2609,9 @@ CONFIG_SYS_FSL_QBMAN_SIZE_1
 CONFIG_SYS_FSL_QMAN_ADDR
 CONFIG_SYS_FSL_QMAN_OFFSET
 CONFIG_SYS_FSL_QMAN_V3
-CONFIG_SYS_FSL_QSPI_AHB
 CONFIG_SYS_FSL_QSPI_BASE
 CONFIG_SYS_FSL_QSPI_BASE1
 CONFIG_SYS_FSL_QSPI_BASE2
-CONFIG_SYS_FSL_QSPI_BE
-CONFIG_SYS_FSL_QSPI_LE
 CONFIG_SYS_FSL_QSPI_SIZE
 CONFIG_SYS_FSL_QSPI_SIZE1
 CONFIG_SYS_FSL_QSPI_SIZE2
-- 
2.17.1

[Patch v2 2/7] treewide: Remove unused FSL QSPI config options

[Priyanka Jain]

>-----Original Message-----
>From: Kuldeep Singh <kuldeep.singh@nxp.com>
>Sent: Monday, December 16, 2019 5:19 PM
>To: u-boot at lists.denx.de
>Cc: jagan at amarulasolutions.com; Priyanka Jain <priyanka.jain@nxp.com>;
>sr at denx.de; Ashish Kumar <ashish.kumar@nxp.com>;
>frieder.schrempf at kontron.de; Kuldeep Singh <kuldeep.singh@nxp.com>;
>Ashish Kumar <ashish.kumar@nxp.com>
>Subject: [Patch v2 2/7] treewide: Remove unused FSL QSPI config options
>
>Some of these options are not used by the driver anymore and some of them
>are obsolete as the information is gathered from the dt.
>Also consolidating defines in common headers.
>
>Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de>
>Signed-off-by: Ashish Kumar <Ashish.Kumar@nxp.com>
>Signed-off-by: Kuldeep Singh <kuldeep.singh@nxp.com>
>---
> .../include/asm/arch-fsl-layerscape/config.h   |  1 -
> arch/arm/include/asm/arch-ls102xa/config.h     |  1 -
> include/configs/ls1012a_common.h               | 17 +----------------
> include/configs/ls1012afrwy.h                  |  3 ---
> include/configs/ls1012ardb.h                   |  3 ---
> include/configs/ls1021aiot.h                   |  6 ------
> include/configs/ls1021aqds.h                   | 11 -----------
> include/configs/ls1021atwr.h                   | 10 ----------
> include/configs/ls1043aqds.h                   |  2 --
> include/configs/ls1046afrwy.h                  |  9 ---------
> include/configs/ls1046aqds.h                   | 11 -----------
> include/configs/ls1046ardb.h                   | 13 -------------
> include/configs/ls1088a_common.h               |  6 ------
> include/configs/ls1088aqds.h                   |  8 --------
> include/configs/ls1088ardb.h                   | 18 ------------------
> include/configs/ls2080aqds.h                   |  2 --
> include/configs/ls2080ardb.h                   |  8 ++------
> include/configs/mx6sxsabreauto.h               |  6 ------
> include/configs/mx6sxsabresd.h                 | 11 -----------
> include/configs/mx6ul_14x14_evk.h              |  6 ------
> include/configs/mx6ullevk.h                    |  6 ------
> include/configs/mx7dsabresd.h                  |  8 --------
> include/configs/pcm052.h                       |  7 -------
> include/configs/vf610twr.h                     |  8 --------
> scripts/config_whitelist.txt                   |  5 -----
> 25 files changed, 3 insertions(+), 183 deletions(-)
>
>diff --git a/arch/arm/include/asm/arch-fsl-layerscape/config.h
>b/arch/arm/include/asm/arch-fsl-layerscape/config.h
>index a83c70ece2..913f7b179f 100644
>--- a/arch/arm/include/asm/arch-fsl-layerscape/config.h
>+++ b/arch/arm/include/asm/arch-fsl-layerscape/config.h
>@@ -304,7 +304,6 @@
> #define CONFIG_SYS_FSL_ESDHC_BE
> #define CONFIG_SYS_FSL_WDOG_BE
> #define CONFIG_SYS_FSL_DSPI_BE
>-#define CONFIG_SYS_FSL_QSPI_BE
> #define CONFIG_SYS_FSL_CCSR_GUR_BE
> #define CONFIG_SYS_FSL_PEX_LUT_BE
>
>diff --git a/arch/arm/include/asm/arch-ls102xa/config.h
>b/arch/arm/include/asm/arch-ls102xa/config.h
>index 970537870d..3884948a2c 100644
>--- a/arch/arm/include/asm/arch-ls102xa/config.h
>+++ b/arch/arm/include/asm/arch-ls102xa/config.h
>@@ -94,7 +94,6 @@
> #define CONFIG_SYS_FSL_ESDHC_BE
> #define CONFIG_SYS_FSL_WDOG_BE
> #define CONFIG_SYS_FSL_DSPI_BE
>-#define CONFIG_SYS_FSL_QSPI_BE
> #define CONFIG_SYS_FSL_DCU_BE
> #define CONFIG_SYS_FSL_SEC_MON_LE
> #define CONFIG_SYS_FSL_SFP_VER_3_2
>diff --git a/include/configs/ls1012a_common.h
>b/include/configs/ls1012a_common.h
>index 2579e2fb37..efd0ee41b6 100644
>--- a/include/configs/ls1012a_common.h
>+++ b/include/configs/ls1012a_common.h
>@@ -37,23 +37,8 @@
> #define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 128 *
>1024)
>
> /*SPI device */
>-#if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_TFABOOT)
> #define CONFIG_SYS_FMAN_FW_ADDR		0x400d0000
>-#define CONFIG_SPI_FLASH_SPANSION
Please check order of patches. We are just removing configs in these patches, but adding the same in subsequent patches.
Wont it break the system in between the series?
<snip>
-Priyanka

[Patch v2 2/7] treewide: Remove unused FSL QSPI config options

[Kuldeep Singh]

Hi Priyanka,

> -----Original Message-----
> From: Priyanka Jain <priyanka.jain@nxp.com>
> Sent: Tuesday, December 17, 2019 10:32 AM
> To: Kuldeep Singh <kuldeep.singh@nxp.com>; u-boot at lists.denx.de
> Cc: jagan at amarulasolutions.com; sr at denx.de; Ashish Kumar
> <ashish.kumar@nxp.com>; frieder.schrempf at kontron.de; Kuldeep Singh
> <kuldeep.singh@nxp.com>; Ashish Kumar <ashish.kumar@nxp.com>
> Subject: RE: [Patch v2 2/7] treewide: Remove unused FSL QSPI config options
> 
> 
> 
> >-----Original Message-----
> >From: Kuldeep Singh <kuldeep.singh@nxp.com>
> >Sent: Monday, December 16, 2019 5:19 PM
> >To: u-boot at lists.denx.de
> >Cc: jagan at amarulasolutions.com; Priyanka Jain <priyanka.jain@nxp.com>;
> >sr at denx.de; Ashish Kumar <ashish.kumar@nxp.com>;
> >frieder.schrempf at kontron.de; Kuldeep Singh <kuldeep.singh@nxp.com>;
> >Ashish Kumar <ashish.kumar@nxp.com>
> >Subject: [Patch v2 2/7] treewide: Remove unused FSL QSPI config options
> >
> >Some of these options are not used by the driver anymore and some of
> >them are obsolete as the information is gathered from the dt.
> >Also consolidating defines in common headers.
> >
> >Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de>
> >Signed-off-by: Ashish Kumar <Ashish.Kumar@nxp.com>
> >Signed-off-by: Kuldeep Singh <kuldeep.singh@nxp.com>
> >---
> > .../include/asm/arch-fsl-layerscape/config.h   |  1 -
> > arch/arm/include/asm/arch-ls102xa/config.h     |  1 -
> > include/configs/ls1012a_common.h               | 17 +----------------
> > include/configs/ls1012afrwy.h                  |  3 ---
> > include/configs/ls1012ardb.h                   |  3 ---
> > include/configs/ls1021aiot.h                   |  6 ------
> > include/configs/ls1021aqds.h                   | 11 -----------
> > include/configs/ls1021atwr.h                   | 10 ----------
> > include/configs/ls1043aqds.h                   |  2 --
> > include/configs/ls1046afrwy.h                  |  9 ---------
> > include/configs/ls1046aqds.h                   | 11 -----------
> > include/configs/ls1046ardb.h                   | 13 -------------
> > include/configs/ls1088a_common.h               |  6 ------
> > include/configs/ls1088aqds.h                   |  8 --------
> > include/configs/ls1088ardb.h                   | 18 ------------------
> > include/configs/ls2080aqds.h                   |  2 --
> > include/configs/ls2080ardb.h                   |  8 ++------
> > include/configs/mx6sxsabreauto.h               |  6 ------
> > include/configs/mx6sxsabresd.h                 | 11 -----------
> > include/configs/mx6ul_14x14_evk.h              |  6 ------
> > include/configs/mx6ullevk.h                    |  6 ------
> > include/configs/mx7dsabresd.h                  |  8 --------
> > include/configs/pcm052.h                       |  7 -------
> > include/configs/vf610twr.h                     |  8 --------
> > scripts/config_whitelist.txt                   |  5 -----
> > 25 files changed, 3 insertions(+), 183 deletions(-)
> >
> >diff --git a/arch/arm/include/asm/arch-fsl-layerscape/config.h
> >b/arch/arm/include/asm/arch-fsl-layerscape/config.h
> >index a83c70ece2..913f7b179f 100644
> >--- a/arch/arm/include/asm/arch-fsl-layerscape/config.h
> >+++ b/arch/arm/include/asm/arch-fsl-layerscape/config.h
> >@@ -304,7 +304,6 @@
> > #define CONFIG_SYS_FSL_ESDHC_BE
> > #define CONFIG_SYS_FSL_WDOG_BE
> > #define CONFIG_SYS_FSL_DSPI_BE
> >-#define CONFIG_SYS_FSL_QSPI_BE
> > #define CONFIG_SYS_FSL_CCSR_GUR_BE
> > #define CONFIG_SYS_FSL_PEX_LUT_BE
> >
> >diff --git a/arch/arm/include/asm/arch-ls102xa/config.h
> >b/arch/arm/include/asm/arch-ls102xa/config.h
> >index 970537870d..3884948a2c 100644
> >--- a/arch/arm/include/asm/arch-ls102xa/config.h
> >+++ b/arch/arm/include/asm/arch-ls102xa/config.h
> >@@ -94,7 +94,6 @@
> > #define CONFIG_SYS_FSL_ESDHC_BE
> > #define CONFIG_SYS_FSL_WDOG_BE
> > #define CONFIG_SYS_FSL_DSPI_BE
> >-#define CONFIG_SYS_FSL_QSPI_BE
> > #define CONFIG_SYS_FSL_DCU_BE
> > #define CONFIG_SYS_FSL_SEC_MON_LE
> > #define CONFIG_SYS_FSL_SFP_VER_3_2
> >diff --git a/include/configs/ls1012a_common.h
> >b/include/configs/ls1012a_common.h
> >index 2579e2fb37..efd0ee41b6 100644
> >--- a/include/configs/ls1012a_common.h
> >+++ b/include/configs/ls1012a_common.h
> >@@ -37,23 +37,8 @@
> > #define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 128 *
> >1024)
> >
> > /*SPI device */
> >-#if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_TFABOOT)
> > #define CONFIG_SYS_FMAN_FW_ADDR		0x400d0000
> >-#define CONFIG_SPI_FLASH_SPANSION
> Please check order of patches. We are just removing configs in these patches,
> but adding the same in subsequent patches.
> Wont it break the system in between the series?

I am not sure of system breaking but it's better to move config CONFIG_SPI_FLASH_SPANSION from header to defconfigs in same patch.
I'll update this in next version.

Thanks
Kuldeep

> <snip>
> -Priyanka

[Patch v2 3/7] configs: ls1043a: Move CONFIG_FSL_QSPI to defconfig

[Kuldeep Singh]

Move CONFIG_FSL_QSPI to the boards defconfigs and while at it also move
CONFIG_SPI_FLASH_SPANSION.

Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de>
Signed-off-by: Kuldeep Singh <kuldeep.singh@nxp.com>
---
 configs/ls1043aqds_qspi_defconfig            | 1 +
 configs/ls1043aqds_sdcard_qspi_defconfig     | 1 +
 configs/ls1043aqds_tfa_SECURE_BOOT_defconfig | 2 ++
 configs/ls1043aqds_tfa_defconfig             | 1 +
 include/configs/ls1043aqds.h                 | 8 --------
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/configs/ls1043aqds_qspi_defconfig b/configs/ls1043aqds_qspi_defconfig
index 36e6f4cce4..6cdd1341ed 100644
--- a/configs/ls1043aqds_qspi_defconfig
+++ b/configs/ls1043aqds_qspi_defconfig
@@ -40,6 +40,7 @@ CONFIG_DM_MMC=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
 # CONFIG_SPI_FLASH_BAR is not set
+CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
diff --git a/configs/ls1043aqds_sdcard_qspi_defconfig b/configs/ls1043aqds_sdcard_qspi_defconfig
index 3ee00a87eb..d5b9b21e0a 100644
--- a/configs/ls1043aqds_sdcard_qspi_defconfig
+++ b/configs/ls1043aqds_sdcard_qspi_defconfig
@@ -53,6 +53,7 @@ CONFIG_DM_MMC=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
 # CONFIG_SPI_FLASH_BAR is not set
+CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
diff --git a/configs/ls1043aqds_tfa_SECURE_BOOT_defconfig b/configs/ls1043aqds_tfa_SECURE_BOOT_defconfig
index 0ece698350..507543601b 100644
--- a/configs/ls1043aqds_tfa_SECURE_BOOT_defconfig
+++ b/configs/ls1043aqds_tfa_SECURE_BOOT_defconfig
@@ -44,6 +44,7 @@ CONFIG_SYS_FLASH_CFI=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SF_DEFAULT_BUS=1
+CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
@@ -55,6 +56,7 @@ CONFIG_DM_SCSI=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
+CONFIG_FSL_QSPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
diff --git a/configs/ls1043aqds_tfa_defconfig b/configs/ls1043aqds_tfa_defconfig
index 4c757e28db..a6709638c2 100644
--- a/configs/ls1043aqds_tfa_defconfig
+++ b/configs/ls1043aqds_tfa_defconfig
@@ -54,6 +54,7 @@ CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SF_DEFAULT_BUS=1
 # CONFIG_SPI_FLASH_BAR is not set
+CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h
index 063e724b7c..fef5a2eb96 100644
--- a/include/configs/ls1043aqds.h
+++ b/include/configs/ls1043aqds.h
@@ -379,14 +379,6 @@ unsigned long get_board_ddr_clk(void);
 #define VDD_MV_MIN			819
 #define VDD_MV_MAX			1212
 
-/* QSPI device */
-#if defined(CONFIG_TFABOOT) || \
-	(defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI))
-#ifdef CONFIG_FSL_QSPI
-#define CONFIG_SPI_FLASH_SPANSION
-#endif
-#endif
-
 /*
  * Miscellaneous configurable options
  */
-- 
2.17.1

[Patch v2 4/7] imx: imx6sx: Remove unused 'num-cs' property

[Kuldeep Singh]

From: Frieder Schrempf <frieder.schrempf@kontron.de>

This property is not used by the driver anymore so let's remove it.
Other dts still have 'num-cs' set, but they need a resync with the
Linux kernel anyway, so let's only do the U-Boot-specific files for
now.

Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de>
Signed-off-by: Kuldeep Singh <kuldeep.singh@nxp.com>
---
 arch/arm/dts/imx6sx-sabreauto-u-boot.dtsi | 2 --
 arch/arm/dts/imx6sx-sdb-u-boot.dtsi       | 2 --
 2 files changed, 4 deletions(-)

diff --git a/arch/arm/dts/imx6sx-sabreauto-u-boot.dtsi b/arch/arm/dts/imx6sx-sabreauto-u-boot.dtsi
index 549461df71..5200448a9d 100644
--- a/arch/arm/dts/imx6sx-sabreauto-u-boot.dtsi
+++ b/arch/arm/dts/imx6sx-sabreauto-u-boot.dtsi
@@ -4,8 +4,6 @@
  */
 
 &qspi1 {
-	num-cs = <2>;
-
 	flash0: n25q256a at 0 {
 		compatible = "jedec,spi-nor";
 	};
diff --git a/arch/arm/dts/imx6sx-sdb-u-boot.dtsi b/arch/arm/dts/imx6sx-sdb-u-boot.dtsi
index 8f9236da0f..3c0fd874c1 100644
--- a/arch/arm/dts/imx6sx-sdb-u-boot.dtsi
+++ b/arch/arm/dts/imx6sx-sdb-u-boot.dtsi
@@ -4,8 +4,6 @@
  */
 
 &qspi2 {
-	num-cs = <2>;
-
 	flash0: n25q256a at 0 {
 		compatible = "jedec,spi-nor";
 	};
-- 
2.17.1

[Patch v2 5/7] configs: ls1012a: Enable CONFIG_SPI_FLASH_SPANSION

[Kuldeep Singh]

Since CONFIG_FSL_QSPI is already enabled for LS1012A in defconfigs. Also
enable the CONFIG_SPI_FLASH_SPANSION for LS1012A boards having spansion
flashes.

Signed-off-by: Ashish Kumar <Ashish.Kumar@nxp.com>
Signed-off-by: Kuldeep Singh <kuldeep.singh@nxp.com>
---
 configs/ls1012a2g5rdb_qspi_defconfig          | 1 +
 configs/ls1012a2g5rdb_tfa_defconfig           | 1 +
 configs/ls1012afrdm_qspi_defconfig            | 1 +
 configs/ls1012afrdm_tfa_defconfig             | 1 +
 configs/ls1012aqds_qspi_defconfig             | 1 +
 configs/ls1012aqds_tfa_SECURE_BOOT_defconfig  | 1 +
 configs/ls1012aqds_tfa_defconfig              | 1 +
 configs/ls1012ardb_qspi_SECURE_BOOT_defconfig | 1 +
 configs/ls1012ardb_qspi_defconfig             | 1 +
 configs/ls1012ardb_tfa_SECURE_BOOT_defconfig  | 1 +
 configs/ls1012ardb_tfa_defconfig              | 1 +
 11 files changed, 11 insertions(+)

diff --git a/configs/ls1012a2g5rdb_qspi_defconfig b/configs/ls1012a2g5rdb_qspi_defconfig
index 3c99a43ded..c98974e48d 100644
--- a/configs/ls1012a2g5rdb_qspi_defconfig
+++ b/configs/ls1012a2g5rdb_qspi_defconfig
@@ -40,6 +40,7 @@ CONFIG_FSL_ESDHC=y
 CONFIG_MTD=y
 CONFIG_DM_SPI_FLASH=y
 # CONFIG_SPI_FLASH_BAR is not set
+CONFIG_SPI_FLASH_SPANSION=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
 CONFIG_FSL_PFE=y
 CONFIG_DM_ETH=y
diff --git a/configs/ls1012a2g5rdb_tfa_defconfig b/configs/ls1012a2g5rdb_tfa_defconfig
index 0865ac2fdf..8647223a2b 100644
--- a/configs/ls1012a2g5rdb_tfa_defconfig
+++ b/configs/ls1012a2g5rdb_tfa_defconfig
@@ -40,6 +40,7 @@ CONFIG_FSL_ESDHC=y
 CONFIG_MTD=y
 CONFIG_DM_SPI_FLASH=y
 # CONFIG_SPI_FLASH_BAR is not set
+CONFIG_SPI_FLASH_SPANSION=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
 CONFIG_FSL_PFE=y
 CONFIG_DM_ETH=y
diff --git a/configs/ls1012afrdm_qspi_defconfig b/configs/ls1012afrdm_qspi_defconfig
index 7ff0955f1d..3db5181623 100644
--- a/configs/ls1012afrdm_qspi_defconfig
+++ b/configs/ls1012afrdm_qspi_defconfig
@@ -36,6 +36,7 @@ CONFIG_DM=y
 CONFIG_MTD=y
 CONFIG_DM_SPI_FLASH=y
 # CONFIG_SPI_FLASH_BAR is not set
+CONFIG_SPI_FLASH_SPANSION=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
 CONFIG_FSL_PFE=y
 CONFIG_DM_ETH=y
diff --git a/configs/ls1012afrdm_tfa_defconfig b/configs/ls1012afrdm_tfa_defconfig
index 8e8ddd73ed..ffbf79f91c 100644
--- a/configs/ls1012afrdm_tfa_defconfig
+++ b/configs/ls1012afrdm_tfa_defconfig
@@ -36,6 +36,7 @@ CONFIG_DM=y
 CONFIG_MTD=y
 CONFIG_DM_SPI_FLASH=y
 # CONFIG_SPI_FLASH_BAR is not set
+CONFIG_SPI_FLASH_SPANSION=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
 CONFIG_FSL_PFE=y
 CONFIG_DM_ETH=y
diff --git a/configs/ls1012aqds_qspi_defconfig b/configs/ls1012aqds_qspi_defconfig
index 0a719c30c5..559db02130 100644
--- a/configs/ls1012aqds_qspi_defconfig
+++ b/configs/ls1012aqds_qspi_defconfig
@@ -57,6 +57,7 @@ CONFIG_SF_DEFAULT_BUS=1
 CONFIG_SF_DEFAULT_MODE=0
 CONFIG_SF_DEFAULT_SPEED=10000000
 # CONFIG_SPI_FLASH_BAR is not set
+CONFIG_SPI_FLASH_SPANSION=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
 CONFIG_FSL_PFE=y
 CONFIG_DM_ETH=y
diff --git a/configs/ls1012aqds_tfa_SECURE_BOOT_defconfig b/configs/ls1012aqds_tfa_SECURE_BOOT_defconfig
index 25d06d2919..f012c34c12 100644
--- a/configs/ls1012aqds_tfa_SECURE_BOOT_defconfig
+++ b/configs/ls1012aqds_tfa_SECURE_BOOT_defconfig
@@ -47,6 +47,7 @@ CONFIG_SF_DEFAULT_BUS=1
 CONFIG_SF_DEFAULT_MODE=0
 CONFIG_SF_DEFAULT_SPEED=10000000
 # CONFIG_SPI_FLASH_BAR is not set
+CONFIG_SPI_FLASH_SPANSION=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
 CONFIG_FSL_PFE=y
 CONFIG_DM_ETH=y
diff --git a/configs/ls1012aqds_tfa_defconfig b/configs/ls1012aqds_tfa_defconfig
index bde53a420c..37693a0cb4 100644
--- a/configs/ls1012aqds_tfa_defconfig
+++ b/configs/ls1012aqds_tfa_defconfig
@@ -57,6 +57,7 @@ CONFIG_SF_DEFAULT_BUS=1
 CONFIG_SF_DEFAULT_MODE=0
 CONFIG_SF_DEFAULT_SPEED=10000000
 # CONFIG_SPI_FLASH_BAR is not set
+CONFIG_SPI_FLASH_SPANSION=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
 CONFIG_FSL_PFE=y
 CONFIG_DM_ETH=y
diff --git a/configs/ls1012ardb_qspi_SECURE_BOOT_defconfig b/configs/ls1012ardb_qspi_SECURE_BOOT_defconfig
index 9989f7b3e9..5129ec53c9 100644
--- a/configs/ls1012ardb_qspi_SECURE_BOOT_defconfig
+++ b/configs/ls1012ardb_qspi_SECURE_BOOT_defconfig
@@ -39,6 +39,7 @@ CONFIG_FSL_ESDHC=y
 CONFIG_MTD=y
 CONFIG_DM_SPI_FLASH=y
 # CONFIG_SPI_FLASH_BAR is not set
+CONFIG_SPI_FLASH_SPANSION=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
 CONFIG_E1000=y
 CONFIG_PCI=y
diff --git a/configs/ls1012ardb_qspi_defconfig b/configs/ls1012ardb_qspi_defconfig
index 80ca9bd577..e4f3272558 100644
--- a/configs/ls1012ardb_qspi_defconfig
+++ b/configs/ls1012ardb_qspi_defconfig
@@ -41,6 +41,7 @@ CONFIG_FSL_ESDHC=y
 CONFIG_MTD=y
 CONFIG_DM_SPI_FLASH=y
 # CONFIG_SPI_FLASH_BAR is not set
+CONFIG_SPI_FLASH_SPANSION=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
 CONFIG_FSL_PFE=y
 CONFIG_DM_ETH=y
diff --git a/configs/ls1012ardb_tfa_SECURE_BOOT_defconfig b/configs/ls1012ardb_tfa_SECURE_BOOT_defconfig
index 8eb71fcf63..3dc7e5ad84 100644
--- a/configs/ls1012ardb_tfa_SECURE_BOOT_defconfig
+++ b/configs/ls1012ardb_tfa_SECURE_BOOT_defconfig
@@ -39,6 +39,7 @@ CONFIG_FSL_ESDHC=y
 CONFIG_MTD=y
 CONFIG_DM_SPI_FLASH=y
 # CONFIG_SPI_FLASH_BAR is not set
+CONFIG_SPI_FLASH_SPANSION=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
 CONFIG_E1000=y
 CONFIG_PCI=y
diff --git a/configs/ls1012ardb_tfa_defconfig b/configs/ls1012ardb_tfa_defconfig
index 1cc358ce74..b4c5d36773 100644
--- a/configs/ls1012ardb_tfa_defconfig
+++ b/configs/ls1012ardb_tfa_defconfig
@@ -42,6 +42,7 @@ CONFIG_FSL_ESDHC=y
 CONFIG_MTD=y
 CONFIG_DM_SPI_FLASH=y
 # CONFIG_SPI_FLASH_BAR is not set
+CONFIG_SPI_FLASH_SPANSION=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
 CONFIG_FSL_PFE=y
 CONFIG_DM_ETH=y
-- 
2.17.1

[Patch v2 6/7] configs: ls1046a: Move SPI_FLASH_SPANSION to defconfig

[Kuldeep Singh]

Enable CONFIG_SPI_FLASH_SPANSION in defconfigs of LS1046ARDB and
LS1046AQDS which have two spansion flases i.e s25fs512s each of size
64M.

Signed-off-by: Kuldeep Singh <kuldeep.singh@nxp.com>
---
 configs/ls1046aqds_qspi_defconfig             | 1 +
 configs/ls1046aqds_sdcard_qspi_defconfig      | 1 +
 configs/ls1046aqds_tfa_SECURE_BOOT_defconfig  | 1 +
 configs/ls1046aqds_tfa_defconfig              | 1 +
 configs/ls1046ardb_qspi_SECURE_BOOT_defconfig | 1 +
 configs/ls1046ardb_qspi_defconfig             | 1 +
 configs/ls1046ardb_tfa_SECURE_BOOT_defconfig  | 1 +
 configs/ls1046ardb_tfa_defconfig              | 1 +
 include/configs/ls1046aqds.h                  | 8 --------
 include/configs/ls1046ardb.h                  | 7 -------
 10 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/configs/ls1046aqds_qspi_defconfig b/configs/ls1046aqds_qspi_defconfig
index 7339aba903..b2098c82dc 100644
--- a/configs/ls1046aqds_qspi_defconfig
+++ b/configs/ls1046aqds_qspi_defconfig
@@ -38,6 +38,7 @@ CONFIG_FSL_CAAM=y
 CONFIG_DM_MMC=y
 CONFIG_FSL_ESDHC=y
 # CONFIG_SPI_FLASH_BAR is not set
+CONFIG_SPI_FLASH_SPANSION=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
 CONFIG_PHYLIB=y
 CONFIG_E1000=y
diff --git a/configs/ls1046aqds_sdcard_qspi_defconfig b/configs/ls1046aqds_sdcard_qspi_defconfig
index 88ed9b2aff..e1b4260139 100644
--- a/configs/ls1046aqds_sdcard_qspi_defconfig
+++ b/configs/ls1046aqds_sdcard_qspi_defconfig
@@ -53,6 +53,7 @@ CONFIG_FSL_CAAM=y
 CONFIG_DM_MMC=y
 CONFIG_FSL_ESDHC=y
 # CONFIG_SPI_FLASH_BAR is not set
+CONFIG_SPI_FLASH_SPANSION=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
 CONFIG_PHYLIB=y
 CONFIG_E1000=y
diff --git a/configs/ls1046aqds_tfa_SECURE_BOOT_defconfig b/configs/ls1046aqds_tfa_SECURE_BOOT_defconfig
index e173747923..0edbac39e4 100644
--- a/configs/ls1046aqds_tfa_SECURE_BOOT_defconfig
+++ b/configs/ls1046aqds_tfa_SECURE_BOOT_defconfig
@@ -43,6 +43,7 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_SF_DEFAULT_BUS=1
+CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
diff --git a/configs/ls1046aqds_tfa_defconfig b/configs/ls1046aqds_tfa_defconfig
index 83e94ec7db..5cb973e813 100644
--- a/configs/ls1046aqds_tfa_defconfig
+++ b/configs/ls1046aqds_tfa_defconfig
@@ -53,6 +53,7 @@ CONFIG_SYS_FLASH_CFI=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_SF_DEFAULT_BUS=1
 # CONFIG_SPI_FLASH_BAR is not set
+CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
diff --git a/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig b/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig
index 469ef7670a..ef82b398f8 100644
--- a/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig
+++ b/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig
@@ -34,6 +34,7 @@ CONFIG_FSL_ESDHC=y
 CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 # CONFIG_SPI_FLASH_BAR is not set
+CONFIG_SPI_FLASH_SPANSION=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
diff --git a/configs/ls1046ardb_qspi_defconfig b/configs/ls1046ardb_qspi_defconfig
index 934f04a92e..9418128bb0 100644
--- a/configs/ls1046ardb_qspi_defconfig
+++ b/configs/ls1046ardb_qspi_defconfig
@@ -37,6 +37,7 @@ CONFIG_FSL_ESDHC=y
 CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 # CONFIG_SPI_FLASH_BAR is not set
+CONFIG_SPI_FLASH_SPANSION=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
diff --git a/configs/ls1046ardb_tfa_SECURE_BOOT_defconfig b/configs/ls1046ardb_tfa_SECURE_BOOT_defconfig
index 9aeb33138b..d98021297d 100644
--- a/configs/ls1046ardb_tfa_SECURE_BOOT_defconfig
+++ b/configs/ls1046ardb_tfa_SECURE_BOOT_defconfig
@@ -34,6 +34,7 @@ CONFIG_FSL_ESDHC=y
 CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 # CONFIG_SPI_FLASH_BAR is not set
+CONFIG_SPI_FLASH_SPANSION=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
diff --git a/configs/ls1046ardb_tfa_defconfig b/configs/ls1046ardb_tfa_defconfig
index 2772fa5f93..21b6041c4e 100644
--- a/configs/ls1046ardb_tfa_defconfig
+++ b/configs/ls1046ardb_tfa_defconfig
@@ -39,6 +39,7 @@ CONFIG_FSL_ESDHC=y
 CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 # CONFIG_SPI_FLASH_BAR is not set
+CONFIG_SPI_FLASH_SPANSION=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h
index 437b6ac5e3..8d74f32c06 100644
--- a/include/configs/ls1046aqds.h
+++ b/include/configs/ls1046aqds.h
@@ -41,14 +41,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SPI_FLASH_EON		/* cs2 */
 #endif
 
-/* QSPI */
-#if defined(CONFIG_TFABOOT) ||	\
-	defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)
-#ifdef CONFIG_FSL_QSPI
-#define CONFIG_SPI_FLASH_SPANSION
-#endif
-#endif
-
 #ifdef CONFIG_SYS_DPAA_FMAN
 #define CONFIG_PHY_VITESSE
 #define CONFIG_PHY_REALTEK
diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h
index 61a4a40d60..6db48f78ef 100644
--- a/include/configs/ls1046ardb.h
+++ b/include/configs/ls1046ardb.h
@@ -180,13 +180,6 @@
 
 #endif
 
-/* QSPI device */
-#ifndef SPL_NO_QSPI
-#ifdef CONFIG_FSL_QSPI
-#define CONFIG_SPI_FLASH_SPANSION
-#endif
-#endif
-
 #ifndef SPL_NO_MISC
 #undef CONFIG_BOOTCOMMAND
 #ifdef CONFIG_TFABOOT
-- 
2.17.1

[Patch v2 7/7] treewide: Update fsl qspi node dt properties as per spi-mem driver

[Kuldeep Singh]

According to new qspi driver, some properties like "bus-num, num-cs,
big-endian" are no longer used. Device endiannes can be determined from
device-type data in driver.

Now use board specific compatibles, generic node names and specific
labels to align with linux device-tree properties.

Also consolidate spi-max-frequency to 50Mhz treewide.

Signed-off-by: Kuldeep Singh <kuldeep.singh@nxp.com>
---
 arch/arm/dts/fsl-ls1012a-2g5rdb.dts   | 5 ++---
 arch/arm/dts/fsl-ls1012a-frdm.dtsi    | 5 ++---
 arch/arm/dts/fsl-ls1012a-qds.dtsi     | 5 ++---
 arch/arm/dts/fsl-ls1012a-rdb.dtsi     | 5 ++---
 arch/arm/dts/fsl-ls1012a.dtsi         | 4 +---
 arch/arm/dts/fsl-ls1043a-qds.dtsi     | 5 ++---
 arch/arm/dts/fsl-ls1043a.dtsi         | 6 ++----
 arch/arm/dts/fsl-ls1046a-frwy.dts     | 5 ++---
 arch/arm/dts/fsl-ls1046a-qds.dtsi     | 5 ++---
 arch/arm/dts/fsl-ls1046a-rdb.dts      | 5 ++---
 arch/arm/dts/fsl-ls1046a.dtsi         | 4 +---
 arch/arm/dts/fsl-ls1088a-qds.dts      | 5 ++---
 arch/arm/dts/fsl-ls1088a-rdb.dts      | 5 ++---
 arch/arm/dts/fsl-ls1088a.dtsi         | 2 +-
 arch/arm/dts/fsl-ls2080a-qds.dts      | 5 ++---
 arch/arm/dts/fsl-ls2080a.dtsi         | 4 ++--
 arch/arm/dts/fsl-ls2088a-rdb-qspi.dts | 5 ++---
 arch/arm/dts/ls1021a-twr.dtsi         | 5 ++---
 arch/arm/dts/ls1021a.dtsi             | 6 ++----
 19 files changed, 35 insertions(+), 56 deletions(-)

diff --git a/arch/arm/dts/fsl-ls1012a-2g5rdb.dts b/arch/arm/dts/fsl-ls1012a-2g5rdb.dts
index fecef88e08..09c3239e1a 100644
--- a/arch/arm/dts/fsl-ls1012a-2g5rdb.dts
+++ b/arch/arm/dts/fsl-ls1012a-2g5rdb.dts
@@ -21,14 +21,13 @@
 };
 
 &qspi {
-	bus-num = <0>;
 	status = "okay";
 
-	qflash0: s25fl128s at 0 {
+	s25fl128s0: flash at 0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		spi-max-frequency = <20000000>;
+		spi-max-frequency = <50000000>;
 		reg = <0>;
 	};
 };
diff --git a/arch/arm/dts/fsl-ls1012a-frdm.dtsi b/arch/arm/dts/fsl-ls1012a-frdm.dtsi
index a357793bfa..88aa24a6d2 100644
--- a/arch/arm/dts/fsl-ls1012a-frdm.dtsi
+++ b/arch/arm/dts/fsl-ls1012a-frdm.dtsi
@@ -15,14 +15,13 @@
 };
 
 &qspi {
-	bus-num = <0>;
 	status = "okay";
 
-	qflash0: s25fl128s at 0 {
+	s25fs512s0: flash at 0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		spi-max-frequency = <20000000>;
+		spi-max-frequency = <50000000>;
 		reg = <0>;
 	};
 };
diff --git a/arch/arm/dts/fsl-ls1012a-qds.dtsi b/arch/arm/dts/fsl-ls1012a-qds.dtsi
index a330597b6c..910d2a5c77 100644
--- a/arch/arm/dts/fsl-ls1012a-qds.dtsi
+++ b/arch/arm/dts/fsl-ls1012a-qds.dtsi
@@ -43,14 +43,13 @@
 };
 
 &qspi {
-	bus-num = <0>;
 	status = "okay";
 
-	qflash0: s25fl128s at 0 {
+	s25fs512s0: flash at 0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		spi-max-frequency = <20000000>;
+		spi-max-frequency = <50000000>;
 		reg = <0>;
 	};
 };
diff --git a/arch/arm/dts/fsl-ls1012a-rdb.dtsi b/arch/arm/dts/fsl-ls1012a-rdb.dtsi
index 55155fd321..3757051b78 100644
--- a/arch/arm/dts/fsl-ls1012a-rdb.dtsi
+++ b/arch/arm/dts/fsl-ls1012a-rdb.dtsi
@@ -19,14 +19,13 @@
 };
 
 &qspi {
-	bus-num = <0>;
 	status = "okay";
 
-	qflash0: s25fl128s at 0 {
+	s25fs512s0: flash at 0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		spi-max-frequency = <20000000>;
+		spi-max-frequency = <50000000>;
 		reg = <0>;
 	};
 };
diff --git a/arch/arm/dts/fsl-ls1012a.dtsi b/arch/arm/dts/fsl-ls1012a.dtsi
index 1125e5753b..2d70c82a72 100644
--- a/arch/arm/dts/fsl-ls1012a.dtsi
+++ b/arch/arm/dts/fsl-ls1012a.dtsi
@@ -107,14 +107,12 @@
 		};
 
 		qspi: quadspi at 1550000 {
-			compatible = "fsl,vf610-qspi";
+			compatible = "fsl,ls1021a-qspi";
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0x0 0x1550000 0x0 0x10000>,
 				<0x0 0x40000000 0x0 0x4000000>;
 			reg-names = "QuadSPI", "QuadSPI-memory";
-			num-cs = <1>;
-			big-endian;
 			status = "disabled";
 		};
 
diff --git a/arch/arm/dts/fsl-ls1043a-qds.dtsi b/arch/arm/dts/fsl-ls1043a-qds.dtsi
index 70e1a6a53f..884bdad196 100644
--- a/arch/arm/dts/fsl-ls1043a-qds.dtsi
+++ b/arch/arm/dts/fsl-ls1043a-qds.dtsi
@@ -53,14 +53,13 @@
 };
 
 &qspi {
-	bus-num = <0>;
 	status = "okay";
 
-	qflash0: s25fl128s at 0 {
+	s25fl128s0: flash at 0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		spi-max-frequency = <20000000>;
+		spi-max-frequency = <50000000>;
 		reg = <0>;
 	};
 };
diff --git a/arch/arm/dts/fsl-ls1043a.dtsi b/arch/arm/dts/fsl-ls1043a.dtsi
index b159c3ca73..1c1bd5092e 100644
--- a/arch/arm/dts/fsl-ls1043a.dtsi
+++ b/arch/arm/dts/fsl-ls1043a.dtsi
@@ -210,14 +210,12 @@
 			status = "disabled";
 		};
 		qspi: quadspi at 1550000 {
-			compatible = "fsl,vf610-qspi";
+			compatible = "fsl,ls1021a-qspi";
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0x0 0x1550000 0x0 0x10000>,
-				<0x0 0x40000000 0x0 0x4000000>;
+				<0x0 0x40000000 0x0 0x1000000>;
 			reg-names = "QuadSPI", "QuadSPI-memory";
-			num-cs = <2>;
-			big-endian;
 			status = "disabled";
 		};
 
diff --git a/arch/arm/dts/fsl-ls1046a-frwy.dts b/arch/arm/dts/fsl-ls1046a-frwy.dts
index 3d41e3bd44..8dace8fc1a 100644
--- a/arch/arm/dts/fsl-ls1046a-frwy.dts
+++ b/arch/arm/dts/fsl-ls1046a-frwy.dts
@@ -19,13 +19,12 @@
 };
 
 &qspi {
-	bus-num = <0>;
 	status = "okay";
 
-	qflash0: mt25qu512abb8esf at 0 {
+	mt25qu512a0: flash at 0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
-		compatible = "spi-flash";
+		compatible = "jedec,spi-nor";
 		spi-max-frequency = <50000000>;
 		reg = <0>;
 	};
diff --git a/arch/arm/dts/fsl-ls1046a-qds.dtsi b/arch/arm/dts/fsl-ls1046a-qds.dtsi
index c95f44fc36..8aa56a8c40 100644
--- a/arch/arm/dts/fsl-ls1046a-qds.dtsi
+++ b/arch/arm/dts/fsl-ls1046a-qds.dtsi
@@ -53,14 +53,13 @@
 };
 
 &qspi {
-	bus-num = <0>;
 	status = "okay";
 
-	qflash0: s25fl128s at 0 {
+	s25fs512s0: flash at 0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		spi-max-frequency = <20000000>;
+		spi-max-frequency = <50000000>;
 		reg = <0>;
 	};
 };
diff --git a/arch/arm/dts/fsl-ls1046a-rdb.dts b/arch/arm/dts/fsl-ls1046a-rdb.dts
index a05c9e9b9e..94fab667ad 100644
--- a/arch/arm/dts/fsl-ls1046a-rdb.dts
+++ b/arch/arm/dts/fsl-ls1046a-rdb.dts
@@ -20,10 +20,9 @@
 };
 
 &qspi {
-	bus-num = <0>;
 	status = "okay";
 
-	qflash0: s25fs512s at 0 {
+	s25fs512s0: flash at 0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
@@ -31,7 +30,7 @@
 		reg = <0>;
 	};
 
-	qflash1: s25fs512s at 1 {
+	s25fs512s1: flash at 1 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
diff --git a/arch/arm/dts/fsl-ls1046a.dtsi b/arch/arm/dts/fsl-ls1046a.dtsi
index fdf93fd268..47777e9f2b 100644
--- a/arch/arm/dts/fsl-ls1046a.dtsi
+++ b/arch/arm/dts/fsl-ls1046a.dtsi
@@ -211,14 +211,12 @@
 		};
 
 		qspi: quadspi at 1550000 {
-			compatible = "fsl,vf610-qspi";
+			compatible = "fsl,ls1021a-qspi";
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0x0 0x1550000 0x0 0x10000>,
 				<0x0 0x40000000 0x0 0x10000000>;
 			reg-names = "QuadSPI", "QuadSPI-memory";
-			num-cs = <4>;
-			big-endian;
 			status = "disabled";
 		};
 
diff --git a/arch/arm/dts/fsl-ls1088a-qds.dts b/arch/arm/dts/fsl-ls1088a-qds.dts
index f07d0c6f27..4f37a28992 100644
--- a/arch/arm/dts/fsl-ls1088a-qds.dts
+++ b/arch/arm/dts/fsl-ls1088a-qds.dts
@@ -108,10 +108,9 @@
 };
 
 &qspi {
-	bus-num = <0>;
 	status = "okay";
 
-	qflash0: s25fs512s at 0 {
+	s25fs512s0: flash at 0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
@@ -119,7 +118,7 @@
 		reg = <0>;
 	};
 
-	qflash1: s25fs512s at 1 {
+	s25fs512s1: flash at 1 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
diff --git a/arch/arm/dts/fsl-ls1088a-rdb.dts b/arch/arm/dts/fsl-ls1088a-rdb.dts
index 0fe351973d..858aef8ecc 100644
--- a/arch/arm/dts/fsl-ls1088a-rdb.dts
+++ b/arch/arm/dts/fsl-ls1088a-rdb.dts
@@ -41,10 +41,9 @@
 };
 
 &qspi {
-	bus-num = <0>;
 	status = "okay";
 
-	qflash0: s25fs512s at 0 {
+	s25fs512s0: flash at 0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
@@ -52,7 +51,7 @@
 		reg = <0>;
 	};
 
-	qflash1: s25fs512s at 1 {
+	s25fs512s1: flash at 1 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
diff --git a/arch/arm/dts/fsl-ls1088a.dtsi b/arch/arm/dts/fsl-ls1088a.dtsi
index abc8b21a11..87f781416b 100644
--- a/arch/arm/dts/fsl-ls1088a.dtsi
+++ b/arch/arm/dts/fsl-ls1088a.dtsi
@@ -98,7 +98,7 @@
 	};
 
 	qspi: quadspi at 1550000 {
-		compatible = "fsl,vf610-qspi";
+		compatible = "fsl,ls1088a-qspi";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		reg = <0x0 0x20c0000 0x0 0x10000>,
diff --git a/arch/arm/dts/fsl-ls2080a-qds.dts b/arch/arm/dts/fsl-ls2080a-qds.dts
index 13461b5c45..f91a48d9fd 100644
--- a/arch/arm/dts/fsl-ls2080a-qds.dts
+++ b/arch/arm/dts/fsl-ls2080a-qds.dts
@@ -72,14 +72,13 @@
 };
 
 &qspi {
-	bus-num = <0>;
 	status = "okay";
 
-	qflash0: s25fs256s at 0 {
+	s25fs256s0: flash at 0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		spi-max-frequency = <20000000>;
+		spi-max-frequency = <50000000>;
 		reg = <0>;
 	};
 };
diff --git a/arch/arm/dts/fsl-ls2080a.dtsi b/arch/arm/dts/fsl-ls2080a.dtsi
index 99ed33af95..0eed7cc775 100644
--- a/arch/arm/dts/fsl-ls2080a.dtsi
+++ b/arch/arm/dts/fsl-ls2080a.dtsi
@@ -102,13 +102,13 @@
 	};
 
 	qspi: quadspi at 1550000 {
-		compatible = "fsl,vf610-qspi";
+		compatible = "fsl,ls2080a-qspi";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		reg = <0x0 0x20c0000 0x0 0x10000>,
 			<0x0 0x20000000 0x0 0x10000000>;
 		reg-names = "QuadSPI", "QuadSPI-memory";
-		num-cs = <4>;
+		status = "disabled";
 	};
 
 	esdhc: esdhc at 0 {
diff --git a/arch/arm/dts/fsl-ls2088a-rdb-qspi.dts b/arch/arm/dts/fsl-ls2088a-rdb-qspi.dts
index 72b2177b70..cabe43fabc 100644
--- a/arch/arm/dts/fsl-ls2088a-rdb-qspi.dts
+++ b/arch/arm/dts/fsl-ls2088a-rdb-qspi.dts
@@ -37,10 +37,9 @@
 };
 
 &qspi {
-	bus-num = <0>;
 	status = "okay";
 
-	qflash0: s25fs512s at 0 {
+	s25fs512s0: flash at 0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
@@ -48,7 +47,7 @@
 		reg = <0>;
 	};
 
-	qflash1: s25fs512s at 1 {
+	s25fs512s1: flash at 1 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
diff --git a/arch/arm/dts/ls1021a-twr.dtsi b/arch/arm/dts/ls1021a-twr.dtsi
index 27c96f9540..bf96af7e36 100644
--- a/arch/arm/dts/ls1021a-twr.dtsi
+++ b/arch/arm/dts/ls1021a-twr.dtsi
@@ -24,14 +24,13 @@
 };
 
 &qspi {
-	bus-num = <0>;
 	status = "okay";
 
-	qflash0: n25q128a13 at 0 {
+	n25q128a130: flash at 0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		spi-max-frequency = <20000000>;
+		spi-max-frequency = <50000000>;
 		reg = <0>;
 	};
 };
diff --git a/arch/arm/dts/ls1021a.dtsi b/arch/arm/dts/ls1021a.dtsi
index e419d9c44f..0eeec43ccc 100644
--- a/arch/arm/dts/ls1021a.dtsi
+++ b/arch/arm/dts/ls1021a.dtsi
@@ -169,14 +169,12 @@
 		};
 
 		qspi: quadspi at 1550000 {
-			compatible = "fsl,vf610-qspi";
+			compatible = "fsl,ls1021a-qspi";
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0x1550000 0x10000>,
-				<0x40000000 0x4000000>;
+				<0x40000000 0x1000000>;
 			reg-names = "QuadSPI", "QuadSPI-memory";
-			num-cs = <2>;
-			big-endian;
 			status = "disabled";
 		};
 
-- 
2.17.1