public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [PATCH v3 0/4] Enable XSPI1 on i.MX943 EVK board
@ 2026-03-03  1:10 alice.guo
  2026-03-03  1:10 ` [PATCH v3 1/4] spi: nxp_xspi: Add new driver for NXP XSPI controller alice.guo
                   ` (3 more replies)
  0 siblings, 4 replies; 8+ messages in thread
From: alice.guo @ 2026-03-03  1:10 UTC (permalink / raw)
  To: NXP i.MX U-Boot Team, u-boot
  Cc: Tom Rini, Stefano Babic, Fabio Estevam, Greg Malysa,
	Arturs Artamonovs, Vasileios Bimpikas, Utsav Agarwal,
	Nathan Barrett-Morrison, Kuan-Wei Chiu, Jerome Forissier,
	Peng Fan, Raymond Mao, Neil Armstrong, Stefan Roese,
	Mattijs Korpershoek, Piotr Wojtaszczyk, Ralph Siemsen,
	Boon Khai Ng, Patrice Chotard, Christian Marangi, Ian Roberts,
	Ye Li, Jacky Bai, Marek Vasut, Sam Protsenko, Alice Guo

Changes for v1:
- Add support for XSPI1 on i.MX943 EVK board
 
Changes for v2:
- Remove the big-endian related code
- Change compatible to "nxp,imx94-xspi"

Changes for v3:
- Add "depends on ARCH_IMX9" to the NXP_XSPI Kconfig entry to prevent
  this driver from being enabled on unsupported platforms like sandbox.

CI: https://github.com/u-boot/u-boot/pull/880/checks
link to the upstream submission:
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/tree/drivers/spi/spi-cadence-xspi.c?h=next-20251219

Signed-off-by: Alice Guo <alice.guo@nxp.com>
---
Alice Guo (2):
      spi: nxp_xspi: Add new driver for NXP XSPI controller
      imx943_evk: Enable XSPI1

Ye Li (2):
      misc: ele_api: Add support for XSPI SET GMID command
      imx94_evk: Get ownership of XSPI control registers protected by GMID in SPL

 MAINTAINERS                             |   1 +
 arch/arm/dts/imx943-evk-u-boot.dtsi     |  34 ++
 arch/arm/dts/imx943-u-boot.dtsi         |  16 +
 arch/arm/include/asm/mach-imx/ele_api.h |   2 +
 board/nxp/imx94_evk/spl.c               |  12 +
 configs/imx943_evk_defconfig            |   9 +
 drivers/misc/imx_ele/ele_api.c          |  28 +
 drivers/spi/Kconfig                     |   8 +
 drivers/spi/Makefile                    |   1 +
 drivers/spi/nxp_xspi.c                  | 881 ++++++++++++++++++++++++++++++++
 drivers/spi/nxp_xspi.h                  | 705 +++++++++++++++++++++++++
 11 files changed, 1697 insertions(+)
---
base-commit: 8d24789abed0822fbe41a2f9d72cf19650159dc6
change-id: 20260303-xspi-b5978fdbcf81

Best regards,
-- 
Alice Guo <alice.guo@nxp.com>


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH v3 1/4] spi: nxp_xspi: Add new driver for NXP XSPI controller
  2026-03-03  1:10 [PATCH v3 0/4] Enable XSPI1 on i.MX943 EVK board alice.guo
@ 2026-03-03  1:10 ` alice.guo
  2026-03-03  3:27   ` Peng Fan
  2026-03-03  1:10 ` [PATCH v3 2/4] misc: ele_api: Add support for XSPI SET GMID command alice.guo
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 8+ messages in thread
From: alice.guo @ 2026-03-03  1:10 UTC (permalink / raw)
  To: NXP i.MX U-Boot Team, u-boot
  Cc: Tom Rini, Stefano Babic, Fabio Estevam, Greg Malysa,
	Arturs Artamonovs, Vasileios Bimpikas, Utsav Agarwal,
	Nathan Barrett-Morrison, Kuan-Wei Chiu, Jerome Forissier,
	Peng Fan, Raymond Mao, Neil Armstrong, Stefan Roese,
	Mattijs Korpershoek, Piotr Wojtaszczyk, Ralph Siemsen,
	Boon Khai Ng, Patrice Chotard, Christian Marangi, Ian Roberts,
	Ye Li, Jacky Bai, Marek Vasut, Sam Protsenko, Alice Guo

From: Alice Guo <alice.guo@nxp.com>

Add new driver to support NXP XSPI controller for NOR and NAND flash.
XSPI controller also uses a programmable sequence engine to provide
flexibility to support existing and future memory devices. It supports
single, dual, quad, octal modes of operation.

Signed-off-by: Ye Li <ye.li@nxp.com>
Signed-off-by: Alice Guo <alice.guo@nxp.com>
---
 MAINTAINERS            |   1 +
 drivers/spi/Kconfig    |   8 +
 drivers/spi/Makefile   |   1 +
 drivers/spi/nxp_xspi.c | 881 +++++++++++++++++++++++++++++++++++++++++++++++++
 drivers/spi/nxp_xspi.h | 705 +++++++++++++++++++++++++++++++++++++++
 5 files changed, 1596 insertions(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index f8d4f6ee8b2..4e25679f0bf 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -323,6 +323,7 @@ F:	doc/imx/
 F:	drivers/mailbox/imx-mailbox.c
 F:	drivers/remoteproc/imx*
 F:	drivers/serial/serial_mxc.c
+F:	drivers/spi/nxp_xspi.c
 F:	include/imx_container.h
 
 ARM HISILICON
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 8c6c095a8cf..fb88175750f 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -408,6 +408,14 @@ config NXP_FSPI
 	  Enable the NXP FlexSPI (FSPI) driver. This driver can be used to
 	  access the SPI NOR flash on platforms embedding this NXP IP core.
 
+config NXP_XSPI
+	bool "NXP XSPI driver"
+	depends on ARCH_IMX9
+	depends on SPI_MEM
+	help
+	  Enable the NXP External SPI (XSPI) driver. This driver can be used to
+	  access the SPI NOR/NAND flash on platforms embedding this NXP IP core.
+
 config OCTEON_SPI
 	bool "Octeon SPI driver"
 	depends on ARCH_OCTEON || ARCH_OCTEONTX || ARCH_OCTEONTX2
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index 0dc2d23e172..13d9c5dce80 100644
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -61,6 +61,7 @@ obj-$(CONFIG_MXS_SPI) += mxs_spi.o
 obj-$(CONFIG_NPCM_FIU_SPI) += npcm_fiu_spi.o
 obj-$(CONFIG_NPCM_PSPI) += npcm_pspi.o
 obj-$(CONFIG_NXP_FSPI) += nxp_fspi.o
+obj-$(CONFIG_NXP_XSPI) += nxp_xspi.o
 obj-$(CONFIG_ATCSPI200_SPI) += atcspi200_spi.o
 obj-$(CONFIG_OCTEON_SPI) += octeon_spi.o
 obj-$(CONFIG_OMAP3_SPI) += omap3_spi.o
diff --git a/drivers/spi/nxp_xspi.c b/drivers/spi/nxp_xspi.c
new file mode 100644
index 00000000000..d5ac4f46c05
--- /dev/null
+++ b/drivers/spi/nxp_xspi.c
@@ -0,0 +1,881 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2025 NXP
+ */
+
+#include <asm/arch/clock.h>
+#include <asm/io.h>
+#include <clk.h>
+#include <dm.h>
+#include <dm/device_compat.h>
+#include <linux/bitops.h>
+#include <linux/bug.h>
+#include <linux/err.h>
+#include <linux/iopoll.h>
+#include <linux/kernel.h>
+#include <linux/sizes.h>
+#include <log.h>
+#include <malloc.h>
+#include <spi.h>
+#include <spi-mem.h>
+
+#include "nxp_xspi.h"
+
+static inline void xspi_writel(struct nxp_xspi *x, u32 val, u32 addr)
+{
+	void __iomem *_addr = (void __iomem *)(uintptr_t)addr;
+
+	out_le32(_addr, val);
+};
+
+static inline u32 xspi_readl(struct nxp_xspi *x, u32 addr)
+{
+	return in_le32((uintptr_t)addr);
+};
+
+#define xspi_config_sfp_tg(x, env, sfar, ipcr) \
+	do { \
+		xspi_writel_offset(x, env, (sfar), SFP_TG_SFAR); \
+		xspi_writel_offset(x, env, (ipcr), SFP_TG_IPCR); \
+	} while (0)
+
+static int xspi_readl_poll_tout(struct nxp_xspi *x, int env, u32 offset,
+				u32 mask, u32 delay_us,
+				u32 timeout_us, bool c)
+{
+	u32 reg;
+	void __iomem *addr = (void __iomem *)(uintptr_t)x->iobase + (env * ENV_ADDR_SIZE) + offset;
+
+	if (c)
+		return readl_poll_sleep_timeout(addr, reg, (reg & mask),
+						delay_us, timeout_us);
+	else
+		return readl_poll_sleep_timeout(addr, reg, !(reg & mask),
+						delay_us, timeout_us);
+};
+
+static struct nxp_xspi_devtype_data imx94_data = {
+	.rxfifo = SZ_512,	/* RX fifo Size*/
+	.rx_buf_size = 64 * 4, /* RBDR buffer size */
+	.txfifo = SZ_1K,
+	.ahb_buf_size = SZ_4K,
+	.quirks = 0,
+};
+
+static const struct udevice_id nxp_xspi_ids[] = {
+	{ .compatible = "nxp,imx94-xspi", .data = (ulong)&imx94_data, },
+	{ }
+};
+
+static int nxp_xspi_claim_bus(struct udevice *dev)
+{
+	return 0;
+}
+
+#if CONFIG_IS_ENABLED(CLK)
+static int nxp_xspi_clk_prep_enable(struct nxp_xspi *x)
+{
+	int ret;
+
+	ret = clk_enable(&x->clk);
+	if (ret)
+		return ret;
+
+	return 0;
+};
+
+static void nxp_xspi_clk_disable_unprep(struct nxp_xspi *x)
+{
+	clk_disable(&x->clk);
+};
+#endif
+
+static int xspi_swreset(struct nxp_xspi *x)
+{
+	u32 reg;
+
+	reg = xspi_readl_offset(x, 0, MCR);
+	reg |= (XSPI_MCR_SWRSTHD_MASK | XSPI_MCR_SWRSTSD_MASK);
+	xspi_writel_offset(x, 0, reg, MCR);
+	udelay(2);
+	reg &= ~(XSPI_MCR_SWRSTHD_MASK | XSPI_MCR_SWRSTSD_MASK);
+	xspi_writel_offset(x, 0, reg, MCR);
+
+	return 0;
+};
+
+static void nxp_xspi_dll_bypass(struct nxp_xspi *x)
+{
+	u32 reg;
+	int ret;
+
+	xspi_swreset(x);
+
+	xspi_writel_offset(x, 0, 0, DLLCRA);
+
+	reg = XSPI_DLLCRA_SLV_EN_MASK;
+	xspi_writel_offset(x, 0, reg, DLLCRA);
+
+	reg = XSPI_DLLCRA_FREQEN_MASK | XSPI_DLLCRA_SLV_EN_MASK |
+		XSPI_DLLCRA_SLV_DLL_BYPASS_MASK | XSPI_DLLCRA_SLV_DLY_COARSE(7);
+	xspi_writel_offset(x, 0, reg, DLLCRA);
+
+	reg |= XSPI_DLLCRA_SLV_UPD_MASK;
+	xspi_writel_offset(x, 0, reg, DLLCRA);
+
+	ret = xspi_readl_poll_tout(x, 0, XSPI_DLLSR, XSPI_DLLSR_SLVA_LOCK_MASK, 1, POLL_TOUT, true);
+	WARN_ON(ret);
+
+	reg &= ~XSPI_DLLCRA_SLV_UPD_MASK;
+	xspi_writel_offset(x, 0, reg, DLLCRA);
+}
+
+static void nxp_xspi_dll_auto(struct nxp_xspi *x, unsigned long rate)
+{
+	u32 reg;
+	int ret;
+
+	xspi_swreset(x);
+
+	xspi_writel_offset(x, 0, 0, DLLCRA);
+
+	reg = XSPI_DLLCRA_SLV_EN_MASK;
+	xspi_writel_offset(x, 0, reg, DLLCRA);
+
+	reg = XSPI_DLLCRA_DLL_REFCNTR(2) | XSPI_DLLCRA_DLLRES(8) |
+		XSPI_DLLCRA_SLAVE_AUTO_UPDT_MASK | XSPI_DLLCRA_SLV_EN_MASK;
+	if (rate > MHZ(133))
+		reg |= XSPI_DLLCRA_FREQEN_MASK;
+
+	xspi_writel_offset(x, 0, reg, DLLCRA);
+
+	reg |= XSPI_DLLCRA_SLV_UPD_MASK;
+	xspi_writel_offset(x, 0, reg, DLLCRA);
+
+	reg |= XSPI_DLLCRA_DLLEN_MASK;
+	xspi_writel_offset(x, 0, reg, DLLCRA);
+
+	ret = xspi_readl_poll_tout(x, 0, XSPI_DLLSR,
+				   XSPI_DLLSR_DLLA_LOCK_MASK | XSPI_DLLSR_SLVA_LOCK_MASK,
+				   1, POLL_TOUT, true);
+	WARN_ON(ret);
+}
+
+static void nxp_xspi_disable_ddr(struct nxp_xspi *x)
+{
+	u32 reg;
+
+	reg = xspi_readl_offset(x, 0, MCR);
+	reg |= XSPI_MCR_MDIS_MASK;
+	xspi_writel_offset(x, 0, reg, MCR);
+
+	reg &= ~(XSPI_MCR_DQS_EN_MASK | XSPI_MCR_DDR_EN_MASK);
+	reg &= ~XSPI_MCR_DQS_FA_SEL_MASK;
+	reg |= XSPI_MCR_DQS_FA_SEL(1);
+	xspi_writel_offset(x, 0, reg, MCR);
+
+	reg = xspi_readl_offset(x, 0, FLSHCR);
+	reg &= ~XSPI_FLSHCR_TDH_MASK;
+	xspi_writel_offset(x, 0, reg, FLSHCR);
+
+	xspi_writel_offset(x, 0, XSPI_SMPR_DLLFSMPFA(7), SMPR);
+
+	reg = xspi_readl_offset(x, 0, MCR);
+	reg &= ~XSPI_MCR_MDIS_MASK;
+	xspi_writel_offset(x, 0, reg, MCR);
+
+	x->support_max_rate = MHZ(133);
+}
+
+static void nxp_xspi_enable_ddr(struct nxp_xspi *x)
+{
+	u32 reg;
+
+	reg = xspi_readl_offset(x, 0, MCR);
+	reg |= XSPI_MCR_MDIS_MASK;
+	xspi_writel_offset(x, 0, reg, MCR);
+
+	reg |= XSPI_MCR_DQS_EN_MASK | XSPI_MCR_DDR_EN_MASK;
+	reg &= ~XSPI_MCR_DQS_FA_SEL_MASK;
+	reg |= XSPI_MCR_DQS_FA_SEL(3);
+	xspi_writel_offset(x, 0, reg, MCR);
+
+	reg = xspi_readl_offset(x, 0, FLSHCR);
+	reg |= XSPI_FLSHCR_TDH(1);
+	xspi_writel_offset(x, 0, reg, FLSHCR);
+
+	xspi_writel_offset(x, 0, XSPI_SMPR_DLLFSMPFA(4), SMPR);
+
+	reg = xspi_readl_offset(x, 0, MCR);
+	reg &= ~XSPI_MCR_MDIS_MASK;
+	xspi_writel_offset(x, 0, reg, MCR);
+
+	x->support_max_rate = MHZ(200);
+}
+
+static int nxp_xspi_set_speed(struct udevice *bus, uint speed)
+{
+	printf("%s: %u\n", __func__, speed);
+#if CONFIG_IS_ENABLED(CLK)
+	struct nxp_xspi *x = dev_get_priv(bus);
+	int ret;
+
+	nxp_xspi_clk_disable_unprep(x);
+
+	ret = clk_set_rate(&x->clk, speed);
+	if (ret < 0)
+		return ret;
+
+	ret = nxp_xspi_clk_prep_enable(x);
+	if (ret)
+		return ret;
+
+	xspi_swreset(x);
+#endif
+	return 0;
+}
+
+static int nxp_xspi_set_mode(struct udevice *bus, uint mode)
+{
+	return 0;
+}
+
+static int nxp_xspi_adjust_op_size(struct spi_slave *slave,
+				   struct spi_mem_op *op)
+{
+	struct nxp_xspi *x;
+	struct udevice *bus;
+
+	bus = slave->dev->parent;
+	x = dev_get_priv(bus);
+
+	if (op->data.dir == SPI_MEM_DATA_OUT) {
+		if (op->data.nbytes > x->devtype_data->txfifo)
+			op->data.nbytes = x->devtype_data->txfifo;
+	} else {
+		if (op->data.nbytes > x->devtype_data->ahb_buf_size)
+			op->data.nbytes = x->devtype_data->ahb_buf_size;
+		else if (op->data.nbytes > x->devtype_data->rxfifo)
+			op->data.nbytes = ALIGN_DOWN(op->data.nbytes, 8);
+	}
+
+	return 0;
+}
+
+static int nxp_xspi_check_buswidth(struct nxp_xspi *x, u8 width)
+{
+	switch (width) {
+	case 1:
+	case 2:
+	case 4:
+	case 8:
+		return 0;
+	}
+
+	return -ENOTSUPP;
+}
+
+static bool nxp_xspi_supports_op(struct spi_slave *slave,
+				 const struct spi_mem_op *op)
+{
+	struct nxp_xspi *x;
+	struct udevice *bus;
+	int ret;
+
+	bus = slave->dev->parent;
+	x = dev_get_priv(bus);
+
+	ret = nxp_xspi_check_buswidth(x, op->cmd.buswidth);
+
+	if (op->addr.nbytes)
+		ret |= nxp_xspi_check_buswidth(x, op->addr.buswidth);
+
+	if (op->dummy.nbytes)
+		ret |= nxp_xspi_check_buswidth(x, op->dummy.buswidth);
+
+	if (op->data.nbytes)
+		ret |= nxp_xspi_check_buswidth(x, op->data.buswidth);
+
+	if (ret)
+		return false;
+
+	/*
+	 * The number of address bytes should be equal to or less than 4 bytes.
+	 */
+	if (op->addr.nbytes > 4)
+		return false;
+
+	/*
+	 * If requested address value is greater than controller assigned
+	 * memory mapped space, return error as it didn't fit in the range
+	 * of assigned address space.
+	 */
+	if (op->addr.val >= x->a1_size + x->a2_size)
+		return false;
+
+	/* Max 64 dummy clock cycles supported */
+	if (op->dummy.buswidth &&
+	    (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 > x->devtype_data->ahb_buf_size ||
+	     (op->data.nbytes > x->devtype_data->rxfifo &&
+	      !IS_ALIGNED(op->data.nbytes, 8))))
+		return false;
+
+	if (op->data.dir == SPI_MEM_DATA_OUT &&
+	    op->data.nbytes > x->devtype_data->txfifo)
+		return false;
+
+	if (op->cmd.dtr)
+		return spi_mem_dtr_supports_op(slave, op);
+	else
+		return spi_mem_default_supports_op(slave, op);
+}
+
+static int xspi_update_lut(struct nxp_xspi *x, u32 seq_index, const u32 *lut_base, u32 num_of_seq)
+{
+	int ret;
+
+	ret = xspi_readl_poll_tout(x, 0, XSPI_SR, XSPI_SR_BUSY_MASK, 1, POLL_TOUT, false);
+	WARN_ON(ret);
+
+	xspi_writel_offset(x, 0, XSPI_LUT_KEY_VAL, LUTKEY);
+	xspi_writel_offset(x, 0, 0x2, LCKCR);
+
+	for (int i = 0; i < num_of_seq * 5; i++)
+		xspi_writel(x, *(lut_base + i), x->iobase + XSPI_LUT + (seq_index * 5 + i) * 4);
+
+	xspi_writel_offset(x, 0, XSPI_LUT_KEY_VAL, LUTKEY);
+	xspi_writel_offset(x, 0, 0x1, LCKCR);
+
+	return 0;
+}
+
+static void nxp_xspi_prepare_lut(struct nxp_xspi *x,
+				 const struct spi_mem_op *op)
+{
+	u32 lutval[5] = {0};
+	int lutidx = 1;
+
+	/* cmd */
+	if (op->cmd.dtr) {
+		lutval[0] |= LUT_DEF(0, CMD_DDR, LUT_PAD(op->cmd.buswidth),
+				     op->cmd.opcode >> 8);
+		lutval[lutidx / 2] |= LUT_DEF(lutidx, CMD_DDR,
+					      LUT_PAD(op->cmd.buswidth),
+					      op->cmd.opcode & 0x00ff);
+		lutidx++;
+	} else {
+		lutval[0] |= LUT_DEF(0, CMD_SDR, LUT_PAD(op->cmd.buswidth),
+				     op->cmd.opcode);
+	}
+
+	/* addr bytes */
+	if (op->addr.nbytes) {
+		lutval[lutidx / 2] |= LUT_DEF(lutidx, op->addr.dtr ?  RADDR_DDR : RADDR_SDR,
+					      LUT_PAD(op->addr.buswidth),
+					      op->addr.nbytes * 8);
+		lutidx++;
+	}
+
+	/* dummy bytes, if needed */
+	if (op->dummy.nbytes) {
+		lutval[lutidx / 2] |= LUT_DEF(lutidx, DUMMY_CYCLE,
+					      LUT_PAD(op->data.buswidth),
+					      op->dummy.nbytes * 8 /
+					      op->dummy.buswidth / (op->dummy.dtr ? 2 : 1));
+		lutidx++;
+	}
+
+	/* read/write data bytes */
+	if (op->data.nbytes) {
+		lutval[lutidx / 2] |= LUT_DEF(lutidx,
+					      op->data.dir == SPI_MEM_DATA_IN ?
+					      (op->data.dtr ? READ_DDR : READ_SDR) :
+					      (op->data.dtr ? WRITE_DDR : WRITE_SDR),
+					      LUT_PAD(op->data.buswidth),
+					      0);
+		lutidx++;
+	}
+
+	/* stop condition. */
+	lutval[lutidx / 2] |= LUT_DEF(lutidx, CMD_STOP, 0, 0);
+#ifdef DEBUG
+	print_buffer(0, lutval, 4, lutidx / 2 + 1, 4);
+#endif
+	xspi_update_lut(x, CMD_LUT_FOR_IP_CMD, lutval, 1);
+
+	if (op->data.nbytes &&
+	    (op->data.dir == SPI_MEM_DATA_IN || op->data.dir == SPI_MEM_DATA_OUT) &&
+	    op->addr.nbytes)
+		xspi_update_lut(x, CMD_LUT_FOR_AHB_CMD, lutval, 1);
+}
+
+static void nxp_xspi_read_ahb(struct nxp_xspi *x, const struct spi_mem_op *op)
+{
+	u32 len = op->data.nbytes;
+
+	/* Read out the data directly from the AHB buffer. */
+	memcpy_fromio(op->data.buf.in, (void *)(uintptr_t)(x->ahb_addr + op->addr.val), len);
+}
+
+static void nxp_xspi_fill_txfifo(struct nxp_xspi *x,
+				 const struct spi_mem_op *op)
+{
+	const u8 *buf = (u8 *)op->data.buf.out;
+	int xfer_remaining_size = op->data.nbytes;
+	u32 reg, val = 0;
+	int ret;
+
+	/* clear the TX FIFO. */
+	xspi_set_reg_field(x, x->config.env, 1, MCR, CLR_TXF);
+	ret = xspi_readl_poll_tout(x, x->config.env, XSPI_MCR,
+				   XSPI_MCR_CLR_TXF_MASK, 1, POLL_TOUT, false);
+	WARN_ON(ret);
+
+	reg = XSPI_TBCT_WMRK((x->devtype_data->txfifo - ALIGN_DOWN(op->data.nbytes, 4)) / 4 + 1);
+	xspi_writel_offset(x, x->config.env, reg, TBCT);
+
+	reg = x->ahb_addr + op->addr.val;
+	xspi_writel_offset(x, x->config.env, reg, SFP_TG_SFAR);
+
+	udelay(2);
+	reg = XSPI_SFP_TG_IPCR_SEQID(CMD_LUT_FOR_IP_CMD) | XSPI_SFP_TG_IPCR_IDATSZ(op->data.nbytes);
+	u64 start = timer_get_us();
+
+	xspi_writel_offset(x, x->config.env, reg, SFP_TG_IPCR);
+
+	while (xfer_remaining_size > 0) {
+		if (xspi_get_reg_field(x, x->config.env, SR, TXFULL))
+			continue;
+
+		if (xfer_remaining_size > 4) {
+			memcpy(&val, buf, 4);
+			buf += 4;
+		} else {
+			val = 0;
+			memcpy(&val, buf, xfer_remaining_size);
+			buf += xfer_remaining_size;
+		}
+
+		xspi_writel_offset(x, x->config.env, val, TBDR);
+		xfer_remaining_size -= 4;
+
+		if (xspi_get_reg_field(x, x->config.env, FR, ILLINE))
+			break;
+	}
+
+	/* Wait for controller being ready. */
+	ret = xspi_readl_poll_tout(x, x->config.env, XSPI_SR,
+				   XSPI_SR_BUSY_MASK, 1, POLL_TOUT, false);
+	WARN_ON(ret);
+
+	u32 trctr = xspi_get_reg_field(x, x->config.env, TBSR, TRCTR);
+
+	if ((ALIGN(op->data.nbytes, 4) / 4) != trctr)
+		dev_dbg(x->dev, "Fail to write data. tx_size = %u, trctr = %u.\n",
+			op->data.nbytes, trctr * 4);
+
+	dev_dbg(x->dev, "tx data size: %u bytes, spend: %llu us\r\n",
+		op->data.nbytes, timer_get_us() - start);
+}
+
+static void nxp_xspi_read_rxfifo(struct nxp_xspi *x,
+				 const struct spi_mem_op *op)
+{
+	u32 reg;
+	int ret, i;
+	u32 val;
+
+	u8 *buf = op->data.buf.in;
+
+	reg = XSPI_RBCT_WMRK(x->devtype_data->rx_buf_size / 4 - 1);
+	xspi_writel_offset(x, x->config.env, reg, RBCT);
+
+	/* clear the TX FIFO. */
+	xspi_set_reg_field(x, x->config.env, 1, MCR, CLR_RXF);
+	ret = xspi_readl_poll_tout(x, x->config.env, XSPI_MCR,
+				   XSPI_MCR_CLR_RXF_MASK, 1, POLL_TOUT, false);
+	WARN_ON(ret);
+
+	xspi_writel_offset(x, x->config.env,  x->ahb_addr + op->addr.val, SFP_TG_SFAR);
+	reg = XSPI_SFP_TG_IPCR_SEQID(CMD_LUT_FOR_IP_CMD) | XSPI_SFP_TG_IPCR_IDATSZ(op->data.nbytes);
+	u64 start = timer_get_us();
+
+	xspi_writel_offset(x, x->config.env, reg, SFP_TG_IPCR);
+
+	ret = xspi_readl_poll_tout(x, x->config.env, XSPI_SR, XSPI_SR_BUSY_MASK, 1,
+				   POLL_TOUT, false);
+	WARN_ON(ret);
+
+	for (i = 0; i < ALIGN_DOWN(op->data.nbytes, 4); i += 4) {
+		if (i == x->devtype_data->rx_buf_size) {
+			reg = xspi_readl_offset(x, x->config.env, FR);
+			reg |= XSPI_FR_RBDF_MASK;
+			xspi_writel_offset(x, x->config.env, reg, FR);
+		}
+		val = xspi_readl(x, x->iobase + (x->config.env * ENV_ADDR_SIZE) +
+				 XSPI_RBDR + (i % x->devtype_data->rx_buf_size));
+		memcpy(buf + i, &val, 4);
+	}
+
+	if (i < op->data.nbytes) {
+		val = xspi_readl(x, x->iobase + (x->config.env * ENV_ADDR_SIZE) +
+				 XSPI_RBDR + (i % x->devtype_data->rx_buf_size));
+		memcpy(buf + i, &val, op->data.nbytes - i);
+	}
+
+	/* clear the RX FIFO. */
+	xspi_set_reg_field(x, x->config.env, 1, MCR, CLR_RXF);
+	ret = xspi_readl_poll_tout(x, x->config.env, XSPI_MCR,
+				   XSPI_MCR_CLR_RXF_MASK, 1, POLL_TOUT, false);
+	WARN_ON(ret);
+
+	dev_dbg(x->dev, "rx data size: %u bytes, spend: %llu us\r\n",
+		op->data.nbytes, timer_get_us() - start);
+}
+
+static int nxp_xspi_xfer_cmd(struct nxp_xspi *x, const struct spi_mem_op *op)
+{
+	u32 reg;
+	int ret;
+
+	xspi_writel_offset(x, x->config.env, x->ahb_addr + op->addr.val, SFP_TG_SFAR);
+	reg = XSPI_SFP_TG_IPCR_SEQID(CMD_LUT_FOR_IP_CMD) | XSPI_SFP_TG_IPCR_IDATSZ(op->data.nbytes);
+	xspi_writel_offset(x, x->config.env, reg, SFP_TG_IPCR);
+
+	/* Wait for controller being ready. */
+	ret = xspi_readl_poll_tout(x, x->config.env, XSPI_SR, XSPI_SR_BUSY_MASK, 1,
+				   POLL_TOUT, false);
+	WARN_ON(ret);
+
+	return 0;
+}
+
+static void nxp_xspi_select_mem(struct nxp_xspi *xspi, struct spi_slave *slave,
+				const struct spi_mem_op *op)
+{
+	unsigned long rate = slave->max_hz;
+
+	if (xspi->selected == spi_chip_select(slave->dev) &&
+		xspi->dtr == op->cmd.dtr)
+		return;
+
+	if (!op->cmd.dtr) {
+		nxp_xspi_disable_ddr(xspi);
+		rate = min(xspi->support_max_rate, rate);
+		xspi->dtr = false;
+	} else {
+		nxp_xspi_enable_ddr(xspi);
+		rate = min(xspi->support_max_rate, rate);
+		rate *= 2;
+		xspi->dtr = true;
+	}
+
+#if CONFIG_IS_ENABLED(CLK)
+	int ret;
+
+	nxp_xspi_clk_disable_unprep(xspi);
+
+	ret = clk_set_rate(&xspi->clk, rate);
+	if (ret < 0)
+		return;
+
+	ret = nxp_xspi_clk_prep_enable(xspi);
+	if (ret)
+		return;
+#endif
+
+	xspi->selected = spi_chip_select(slave->dev);
+
+	if (!op->cmd.dtr || rate < MHZ(60))
+		nxp_xspi_dll_bypass(xspi);
+	else
+		nxp_xspi_dll_auto(xspi, rate);
+}
+
+static int nxp_xspi_exec_op(struct spi_slave *slave,
+			    const struct spi_mem_op *op)
+{
+	struct nxp_xspi *x;
+	struct udevice *bus;
+	int err = 0;
+
+	bus = slave->dev->parent;
+	x = dev_get_priv(bus);
+
+	dev_dbg(bus, "%s:%s:%d\n", __FILE__, __func__, __LINE__);
+	dev_dbg(bus, "buswidth = %u, nbytes = %u, dtr = %u, opcode = 0x%x\n",
+		op->cmd.buswidth, op->cmd.nbytes, op->cmd.dtr, op->cmd.opcode);
+	dev_dbg(bus, "buswidth = %u, nbytes = %u, dtr = %u, val = 0x%llx\n",
+		op->addr.buswidth, op->addr.nbytes, op->addr.dtr, op->addr.val);
+	dev_dbg(bus, "buswidth = %u, nbytes = %u, dtr = %u\n",
+		op->dummy.buswidth, op->dummy.nbytes, op->dummy.dtr);
+	dev_dbg(bus, "buswidth = %u, nbytes = %u, dtr = %u, dir = %u, buf = 0x%llx\n",
+		op->data.buswidth, op->data.nbytes, op->data.dtr, op->data.dir,
+		(u64)op->data.buf.in);
+
+	nxp_xspi_select_mem(x, slave, op);
+
+	nxp_xspi_prepare_lut(x, op);
+	/*
+	 * 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. Read via AHB bus may be corrupted due to
+	 * existence of an errata and therefore discard AHB read in such cases.
+	 */
+	if (op->data.nbytes > (x->config.gmid ? x->devtype_data->rxfifo : DEFAULT_XMIT_SIZE) &&
+	    op->data.dir == SPI_MEM_DATA_IN) {
+		dev_dbg(bus, "ahb read\n");
+		nxp_xspi_read_ahb(x, op);
+	} else {
+		dev_dbg(bus, "ip command\n");
+		/* Wait for controller being ready. */
+		err = xspi_readl_poll_tout(x, x->config.env, XSPI_SR, XSPI_SR_BUSY_MASK,
+					   1, POLL_TOUT, false);
+		WARN_ON(err);
+
+		xspi_writel_offset(x, x->config.env, GENMASK(31, 0), FR);
+
+		if (op->data.nbytes) {
+			if (op->data.dir == SPI_MEM_DATA_OUT)
+				nxp_xspi_fill_txfifo(x, op);
+			else if (op->data.dir == SPI_MEM_DATA_IN)
+				nxp_xspi_read_rxfifo(x, op);
+			else
+				dev_dbg(x->dev, "%d: never should happen\r\n", __LINE__);
+		} else {
+			nxp_xspi_xfer_cmd(x, op);
+		}
+	}
+
+#ifdef DEBUG
+	if (op->data.nbytes <= 10)
+		if (op->data.dir != SPI_MEM_NO_DATA)
+			print_buffer(0, op->data.buf.out, 1, op->data.nbytes, 16);
+#endif
+
+	return err;
+}
+
+static const struct spi_controller_mem_ops nxp_xspi_mem_ops = {
+	.adjust_op_size = nxp_xspi_adjust_op_size,
+	.supports_op = nxp_xspi_supports_op,
+	.exec_op = nxp_xspi_exec_op,
+};
+
+static const struct dm_spi_ops nxp_xspi_ops = {
+	.claim_bus	= nxp_xspi_claim_bus,
+	.set_speed	= nxp_xspi_set_speed,
+	.set_mode	= nxp_xspi_set_mode,
+	.mem_ops        = &nxp_xspi_mem_ops,
+};
+
+static int nxp_xspi_of_to_plat(struct udevice *bus)
+{
+	struct nxp_xspi *x = dev_get_priv(bus);
+	fdt_addr_t iobase;
+	fdt_addr_t iobase_size;
+	fdt_addr_t ahb_addr;
+	fdt_addr_t ahb_size;
+
+#if CONFIG_IS_ENABLED(CLK)
+	int ret;
+#endif
+
+	x->dev = bus;
+
+	iobase = devfdt_get_addr_size_name(bus, "xspi_base", &iobase_size);
+	if (iobase == FDT_ADDR_T_NONE) {
+		dev_err(bus, "xspi_base regs missing\n");
+		return -ENODEV;
+	}
+	x->iobase = iobase;
+
+	ahb_addr = devfdt_get_addr_size_name(bus, "xspi_mmap", &ahb_size);
+	if (ahb_addr == FDT_ADDR_T_NONE) {
+		dev_err(bus, "xspi_mmap regs missing\n");
+		return -ENODEV;
+	}
+	x->ahb_addr = ahb_addr;
+	x->a1_size = ahb_size;
+	x->a2_size = 0;
+	x->config.gmid = true;
+	x->config.env = 0;
+
+#if CONFIG_IS_ENABLED(CLK)
+	ret = clk_get_by_name(bus, "xspi", &x->clk);
+	if (ret) {
+		dev_err(bus, "failed to get xspi clock\n");
+		return ret;
+	}
+#endif
+
+	dev_dbg(bus, "iobase=<0x%x>, ahb_addr=<0x%x>, a1_size=<0x%x>, a2_size=<0x%x>, env=<0x%x>, gmid=<0x%x>\n",
+		x->iobase, x->ahb_addr, x->a1_size, x->a2_size, x->config.env, x->config.gmid);
+
+	return 0;
+}
+
+static int nxp_xspi_config_ahb_buffers(struct nxp_xspi *x)
+{
+	u32 reg;
+
+	reg = XSPI_BUF3CR_MSTRID(0xa);
+	xspi_writel_offset(x, 0, reg, BUF0CR);
+	reg = XSPI_BUF3CR_MSTRID(0x2);
+	xspi_writel_offset(x, 0, reg, BUF1CR);
+	reg = XSPI_BUF3CR_MSTRID(0xd);
+	xspi_writel_offset(x, 0, reg, BUF2CR);
+
+	reg = XSPI_BUF3CR_MSTRID(0x6) | XSPI_BUF3CR_ALLMST_MASK;
+	reg |= XSPI_BUF3CR_ADATSZ(x->devtype_data->ahb_buf_size / 8U);
+	xspi_writel_offset(x, 0, reg, BUF3CR);
+
+	/* Only the buffer3 is used */
+	xspi_writel_offset(x, 0, 0, BUF0IND);
+	xspi_writel_offset(x, 0, 0, BUF1IND);
+	xspi_writel_offset(x, 0, 0, BUF2IND);
+
+	/* Program the Sequence ID for read/write operation. */
+	reg = XSPI_BFGENCR_SEQID_WR_EN_MASK | XSPI_BFGENCR_SEQID(CMD_LUT_FOR_AHB_CMD);
+	xspi_writel_offset(x, 0, reg, BFGENCR);
+
+	/* AHB access towards flash is broken if this AHB alignment boundary is crossed */
+	/* 0-No limit 1-256B 10-512B 11b-limit */
+	xspi_set_reg_field(x, 0, 0, BFGENCR, ALIGN);
+
+	return 0;
+};
+
+static void nxp_xspi_config_mdad(struct nxp_xspi *x)
+{
+	xspi_writel_offset(x, 0, XSPI_TG2MDAD_EXT_VLD_MASK, TG0MDAD);
+	xspi_writel_offset(x, 0, XSPI_TG2MDAD_EXT_VLD_MASK, TG1MDAD);
+	xspi_writel_offset(x, 0, XSPI_TG2MDAD_EXT_VLD_MASK, TG2MDAD_EXT);
+	xspi_writel_offset(x, 0, XSPI_TG2MDAD_EXT_VLD_MASK, TG3MDAD_EXT);
+	xspi_writel_offset(x, 0, XSPI_TG2MDAD_EXT_VLD_MASK, TG4MDAD_EXT);
+}
+
+static void nxp_xspi_config_frad(struct nxp_xspi *x)
+{
+	/* Enable Read/Write Access permissions & Valid */
+	for (int i = 0; i < 8; i++) {
+		xspi_writel(x, XSPI_FRAD0_WORD2_MD0ACP_MASK | XSPI_FRAD0_WORD2_MD1ACP_MASK,
+			    x->iobase + XSPI_FRAD0_WORD2 + (i * 0x20U));
+		xspi_writel(x, XSPI_FRAD0_WORD3_VLD_MASK,
+			    x->iobase + XSPI_FRAD0_WORD3 + (i * 0x20U));
+	}
+	for (int i = 0; i < 8; i++) {
+		xspi_writel(x, XSPI_FRAD0_WORD2_MD0ACP_MASK | XSPI_FRAD0_WORD2_MD1ACP_MASK,
+			    x->iobase + XSPI_FRAD8_WORD2 + (i * 0x20U));
+		xspi_writel(x, XSPI_FRAD0_WORD3_VLD_MASK,
+			    x->iobase + XSPI_FRAD8_WORD3 + (i * 0x20U));
+	}
+}
+
+static int nxp_xspi_default_setup(struct nxp_xspi *x)
+{
+	int ret = 0;
+	u32 reg;
+
+#if CONFIG_IS_ENABLED(CLK)
+	ret = clk_set_rate(&x->clk, 20UL * 1000000UL);
+	if (ret < 0) {
+		dev_err(x->dev, "clk_set_rate fail\n");
+		return ret;
+	}
+	dev_dbg(x->dev, "clk rate = %lu\n", clk_get_rate(&x->clk));
+
+	ret = nxp_xspi_clk_prep_enable(x);
+	if (ret) {
+		dev_err(x->dev, "nxp_xspi_clk_prep_enable fail\n");
+		return ret;
+	}
+#endif
+
+	if (x->config.gmid) {
+		reg = xspi_readl_offset(x, 0, MGC);
+		reg &= ~(XSPI_MGC_GVLD_MASK | XSPI_MGC_GVLDMDAD_MASK | XSPI_MGC_GVLDFRAD_MASK);
+		xspi_writel_offset(x, 0, reg, MGC);
+
+		xspi_writel_offset(x, 0, GENMASK(31, 0), MTO);
+	}
+
+	nxp_xspi_config_mdad(x);
+	nxp_xspi_config_frad(x);
+
+	xspi_set_reg_field(x, 0, 0, MCR, MDIS);
+
+	xspi_swreset(x);
+
+	xspi_set_reg_field(x, 0, 1, MCR, MDIS);
+
+	reg = xspi_readl_offset(x, 0, MCR);
+	reg &= ~(XSPI_MCR_END_CFG_MASK | XSPI_MCR_DQS_FA_SEL_MASK |
+		 XSPI_MCR_DDR_EN_MASK | XSPI_MCR_DQS_EN_MASK | XSPI_MCR_CKN_FA_EN_MASK |
+		 XSPI_MCR_DQS_OUT_EN_MASK | XSPI_MCR_ISD2FA_MASK | XSPI_MCR_ISD3FA_MASK);
+
+	reg |= XSPI_MCR_ISD2FA_MASK;
+	reg |= XSPI_MCR_ISD3FA_MASK;
+
+	reg |= XSPI_MCR_END_CFG(3);
+
+	xspi_writel_offset(x, 0, reg, MCR);
+
+	reg = xspi_readl_offset(x, 0, SFACR);
+
+	reg &= ~(uint32_t)(XSPI_SFACR_CAS_MASK | XSPI_SFACR_WA_MASK |
+			   XSPI_SFACR_BYTE_SWAP_MASK | XSPI_SFACR_WA_4B_EN_MASK |
+			   XSPI_SFACR_FORCE_A10_MASK);
+
+	xspi_writel_offset(x, 0, reg, SFACR);
+
+	nxp_xspi_config_ahb_buffers(x);
+
+	reg = XSPI_FLSHCR_TCSH(3) | XSPI_FLSHCR_TCSS(3);
+	xspi_writel_offset(x, 0, reg, FLSHCR);
+
+	xspi_writel_offset(x, 0, x->ahb_addr + x->a1_size, SFA1AD);
+	xspi_writel_offset(x, 0, x->ahb_addr + x->a1_size + x->a2_size, SFA2AD);
+
+	reg = XSPI_SMPR_DLLFSMPFA(7);
+	xspi_writel_offset(x, 0, reg, SMPR);
+
+	xspi_set_reg_field(x, 0, 0, MCR, MDIS);
+
+	xspi_swreset(x);
+
+	x->selected = -1;
+
+	return ret;
+};
+
+static int nxp_xspi_probe(struct udevice *bus)
+{
+	int ret;
+	struct nxp_xspi *x = dev_get_priv(bus);
+
+	x->devtype_data =
+		(struct nxp_xspi_devtype_data *)dev_get_driver_data(bus);
+
+	ret = nxp_xspi_default_setup(x);
+	if (ret)
+		dev_err(x->dev, "nxp_xspi_default_setup fail %d\n", ret);
+
+	return ret;
+};
+
+U_BOOT_DRIVER(nxp_xspi) = {
+	.name	= "nxp_xspi",
+	.id	= UCLASS_SPI,
+	.of_match = nxp_xspi_ids,
+	.ops	= &nxp_xspi_ops,
+	.of_to_plat = nxp_xspi_of_to_plat,
+	.priv_auto	= sizeof(struct nxp_xspi),
+	.probe	= nxp_xspi_probe,
+	.flags		= DM_FLAG_PRE_RELOC,
+};
diff --git a/drivers/spi/nxp_xspi.h b/drivers/spi/nxp_xspi.h
new file mode 100644
index 00000000000..0072f90b613
--- /dev/null
+++ b/drivers/spi/nxp_xspi.h
@@ -0,0 +1,705 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright 2025 NXP
+ */
+
+#ifndef __NXP_XSPI_H
+#define __NXP_XSPI_H
+
+/* XSPI Register defination */
+
+#define XSPI_MCR 0x0
+
+#define XSPI_MCR_CKN_FA_EN_MASK BIT(26)
+#define XSPI_MCR_CKN_FA_EN_SHIFT 26
+#define XSPI_MCR_DQS_FA_SEL_MASK GENMASK(25, 24)
+#define XSPI_MCR_DQS_FA_SEL_SHIFT 24
+#define XSPI_MCR_DQS_FA_SEL(x) ((x) << 24)
+#define XSPI_MCR_ISD3FA_MASK BIT(17)
+#define XSPI_MCR_ISD3FA_SHIFT 17
+#define XSPI_MCR_ISD3FA_MASK BIT(17)
+#define XSPI_MCR_ISD3FA_SHIFT 17
+#define XSPI_MCR_ISD2FA_MASK BIT(16)
+#define XSPI_MCR_ISD2FA_SHIFT 16
+#define XSPI_MCR_DOZE_MASK BIT(15)
+#define XSPI_MCR_DOZE_SHIFT 15
+#define XSPI_MCR_MDIS_MASK BIT(14)
+#define XSPI_MCR_MDIS_SHIFT 14
+#define XSPI_MCR_DLPEN_MASK BIT(12)
+#define XSPI_MCR_DLPEN_SHIFT 12
+#define XSPI_MCR_CLR_TXF_MASK BIT(11)
+#define XSPI_MCR_CLR_TXF_SHIFT 11
+#define XSPI_MCR_CLR_RXF_MASK BIT(10)
+#define XSPI_MCR_CLR_RXF_SHIFT 10
+#define XSPI_MCR_IPS_TG_RST_MASK BIT(9)
+#define XSPI_MCR_IPS_TG_RST_SHIFT 9
+#define XSPI_MCR_VAR_LAT_EN_MASK BIT(8)
+#define XSPI_MCR_VAR_LAT_EN_SHIFT 8
+#define XSPI_MCR_DDR_EN_MASK BIT(7)
+#define XSPI_MCR_DDR_EN_SHIFT 7
+#define XSPI_MCR_DQS_EN_MASK BIT(6)
+#define XSPI_MCR_DQS_EN_SHIFT 6
+#define XSPI_MCR_DQS_LAT_EN_MASK BIT(5)
+#define XSPI_MCR_DQS_LAT_EN_SHIFT 5
+#define XSPI_MCR_DQS_OUT_EN_MASK BIT(4)
+#define XSPI_MCR_DQS_OUT_EN_SHIFT 4
+#define XSPI_MCR_END_CFG_MASK GENMASK(3, 2)
+#define XSPI_MCR_END_CFG_SHIFT 2
+#define XSPI_MCR_END_CFG(x) ((x) << 2)
+#define XSPI_MCR_SWRSTHD_MASK BIT(1)
+#define XSPI_MCR_SWRSTHD_SHIFT 1
+#define XSPI_MCR_SWRSTSD_MASK BIT(0)
+#define XSPI_MCR_SWRSTSD_SHIFT 0
+
+#define XSPI_IPCR 0x8U
+
+#define XSPI_IPCR_SEQID_MASK GENMASK(27, 24)
+#define XSPI_IPCR_SEQID_SHIFT 24
+#define XSPI_IPCR_SEQID(x) ((x) << 24)
+#define XSPI_IPCR_IDATSZ_MASK GENMASK(14, 0)
+#define XSPI_IPCR_IDATSZ_SHIFT 0
+#define XSPI_IPCR_IDATSZ(x) ((x) << 0)
+
+#define XSPI_FLSHCR 0xCU
+
+#define XSPI_FLSHCR_TDH_MASK GENMASK(17, 16)
+#define XSPI_FLSHCR_TDH_SHIFT 16
+#define XSPI_FLSHCR_TDH(x) ((x) << 16)
+#define XSPI_FLSHCR_TCSH_MASK GENMASK(11, 8)
+#define XSPI_FLSHCR_TCSH_SHIFT 8
+#define XSPI_FLSHCR_TCSH(x) ((x) << 8)
+#define XSPI_FLSHCR_TCSS_MASK GENMASK(3, 0)
+#define XSPI_FLSHCR_TCSS_SHIFT 0
+#define XSPI_FLSHCR_TCSS(x) ((x) << 0)
+
+#define XSPI_BUF0CR 0x010U
+
+#define XSPI_BUF0CR_HP_EN_MASK BIT(31)
+#define XSPI_BUF0CR_HP_EN_SHIFT 31
+#define XSPI_BUF0CR_SUB_DIV_EN_MASK BIT(30)
+#define XSPI_BUF0CR_SUB_DIV_EN_SHIFT 30
+#define XSPI_BUF0CR_SUBBUF2_DIV_MASK GENMASK(29, 27)
+#define XSPI_BUF0CR_SUBBUF2_DIV_SHIFT 27
+#define XSPI_BUF0CR_SUBBUF2_DIV(x) ((x) << 27)
+#define XSPI_BUF0CR_SUBBUF1_DIV_MASK GENMASK(26, 24)
+#define XSPI_BUF0CR_SUBBUF1_DIV_SHIFT 24
+#define XSPI_BUF0CR_SUBBUF1_DIV(x) ((x) << 24)
+#define XSPI_BUF0CR_SUBBUF0_DIV_MASK GENMASK(23, 21)
+#define XSPI_BUF0CR_SUBBUF0_DIV_SHIFT 21
+#define XSPI_BUF0CR_SUBBUF0_DIV(x) ((x) << 21)
+#define XSPI_BUF0CR_ADATSZ_MASK GENMASK(17, 8)
+#define XSPI_BUF0CR_ADATSZ_SHIFT 8
+#define XSPI_BUF0CR_ADATSZ(x) ((x) << 8)
+#define XSPI_BUF0CR_MSTRID_MASK GENMASK(3, 0)
+#define XSPI_BUF0CR_MSTRID_SHIFT 0
+#define XSPI_BUF0CR_MSTRID(x) ((x) << 0)
+
+#define XSPI_BUF1CR 0x014U
+
+#define XSPI_BUF2CR 0x018U
+
+#define XSPI_BUF3CR 0x1CU
+
+#define XSPI_BUF3CR_ALLMST_MASK BIT(31)
+#define XSPI_BUF3CR_ALLMST_SHIFT 31
+#define XSPI_BUF3CR_SUB_DIV_EN_MASK BIT(30)
+#define XSPI_BUF3CR_SUB_DIV_EN_SHIFT 30
+#define XSPI_BUF3CR_SUBBUF2_DIV_MASK GENMASK(29, 27)
+#define XSPI_BUF3CR_SUBBUF2_DIV_SHIFT 27
+#define XSPI_BUF3CR_SUBBUF2_DIV(x) ((x) << 27)
+#define XSPI_BUF3CR_SUBBUF1_DIV_MASK GENMASK(26, 24)
+#define XSPI_BUF3CR_SUBBUF1_DIV_SHIFT 24
+#define XSPI_BUF3CR_SUBBUF1_DIV(x) ((x) << 24)
+#define XSPI_BUF3CR_SUBBUF0_DIV_MASK GENMASK(23, 21)
+#define XSPI_BUF3CR_SUBBUF0_DIV_SHIFT 21
+#define XSPI_BUF3CR_SUBBUF0_DIV(x) ((x) << 21)
+#define XSPI_BUF3CR_ADATSZ_MASK GENMASK(17, 8)
+#define XSPI_BUF3CR_ADATSZ_SHIFT 8
+#define XSPI_BUF3CR_ADATSZ(x) ((x) << 8)
+#define XSPI_BUF3CR_MSTRID_MASK GENMASK(3, 0)
+#define XSPI_BUF3CR_MSTRID_SHIFT 0
+#define XSPI_BUF3CR_MSTRID(x) ((x) << 0)
+
+#define XSPI_BUF0IND 0x030U
+
+#define XSPI_BUF0IND_TPINDX_MASK GENMASK(12, 3)
+#define XSPI_BUF0IND_TPINDX_SHIFT 3
+#define XSPI_BUF0IND_TPINDX(x) ((x) << 3)
+
+#define XSPI_BUF1IND 0x034U
+
+#define XSPI_BUF2IND 0x038U
+
+#define XSPI_AWRCR 0x50
+
+#define XSPI_AWRCR_PPW_WR_DIS_MASK BIT(15)
+#define XSPI_AWRCR_PPW_WR_DIS_SHIFT 15
+#define XSPI_AWRCR_PPW_RD_DIS_MASK BIT(14)
+#define XSPI_AWRCR_PPW_RD_DIS_SHIFT 14
+
+#define XSPI_DLLCRA 0x60U
+
+#define XSPI_DLLCRA_DLLEN_MASK BIT(31)
+#define XSPI_DLLCRA_DLLEN_SHIFT 31
+#define XSPI_DLLCRA_FREQEN_MASK BIT(30)
+#define XSPI_DLLCRA_FREQEN_SHIFT 30
+#define XSPI_DLLCRA_DLL_REFCNTR_MASK GENMASK(27, 24)
+#define XSPI_DLLCRA_DLL_REFCNTR_SHIFT 24
+#define XSPI_DLLCRA_DLL_REFCNTR(x) ((x) << 24)
+#define XSPI_DLLCRA_DLLRES_MASK GENMASK(23, 20)
+#define XSPI_DLLCRA_DLLRES_SHIFT 20
+#define XSPI_DLLCRA_DLLRES(x) ((x) << 20)
+#define XSPI_DLLCRA_SLV_FINE_OFFSET_MASK GENMASK(19, 16)
+#define XSPI_DLLCRA_SLV_FINE_OFFSET_SHIFT 16
+#define XSPI_DLLCRA_SLV_FINE_OFFSET(x) ((x) << 16)
+#define XSPI_DLLCRA_SLV_DLY_OFFSET_MASK GENMASK(14, 12)
+#define XSPI_DLLCRA_SLV_DLY_OFFSET_SHIFT 12
+#define XSPI_DLLCRA_SLV_DLY_OFFSET(x) ((x) << 12)
+#define XSPI_DLLCRA_SLV_DLY_COARSE_MASK GENMASK(11, 8)
+#define XSPI_DLLCRA_SLV_DLY_COARSE_SHIFT 8
+#define XSPI_DLLCRA_SLV_DLY_COARSE(x) ((x) << 8)
+#define XSPI_DLLCRA_SLV_DLY_FINE_MASK GENMASK(7, 5)
+#define XSPI_DLLCRA_SLV_DLY_FINE_SHIFT 5
+#define XSPI_DLLCRA_SLV_DLY_FINE(x) ((x) << 5)
+#define XSPI_DLLCRA_DLL_CDL8_MASK BIT(4)
+#define XSPI_DLLCRA_DLL_CDL8_SHIFT 4
+#define XSPI_DLLCRA_SLAVE_AUTO_UPDT_MASK BIT(3)
+#define XSPI_DLLCRA_SLAVE_AUTO_UPDT_SHIFT 3
+#define XSPI_DLLCRA_SLV_EN_MASK BIT(2)
+#define XSPI_DLLCRA_SLV_EN_SHIFT 2
+#define XSPI_DLLCRA_SLV_DLL_BYPASS_MASK BIT(1)
+#define XSPI_DLLCRA_SLV_DLL_BYPASS_SHIFT 1
+#define XSPI_DLLCRA_SLV_UPD_MASK BIT(0)
+#define XSPI_DLLCRA_SLV_UPD_SHIFT 0
+
+#define XSPI_SFACR 0x104U
+
+#define XSPI_SFACR_FORCE_A10_MASK BIT(22)
+#define XSPI_SFACR_FORCE_A10_SHIFT 22
+#define XSPI_SFACR_WA_4B_EN_MASK BIT(21)
+#define XSPI_SFACR_WA_4B_EN_SHIFT 21
+#define XSPI_SFACR_CAS_INTRLVD_MASK BIT(20)
+#define XSPI_SFACR_CAS_INTRLVD_SHIFT 20
+#define XSPI_SFACR_RX_BP_EN_MASK BIT(18)
+#define XSPI_SFACR_RX_BP_EN_SHIFT 18
+#define XSPI_SFACR_BYTE_SWAP_MASK BIT(17)
+#define XSPI_SFACR_BYTE_SWAP_SHIFT 17
+#define XSPI_SFACR_WA_MASK BIT(16)
+#define XSPI_SFACR_WA_SHIFT 16
+#define XSPI_SFACR_PPWB_MASK GENMASK(12, 8)
+#define XSPI_SFACR_PPWB_SHIFT 8
+#define XSPI_SFACR_PPWB(x) ((x) << 8)
+#define XSPI_SFACR_CAS_MASK GENMASK(3, 0)
+#define XSPI_SFACR_CAS_SHIFT 0
+#define XSPI_SFACR_CAS(x) ((x) << 0)
+
+#define XSPI_SFAR 0x100U
+
+#define XSPI_SFAR_SFADR_MASK GENMASK(31, 0)
+#define XSPI_SFAR_SFADR_SHIFT 0
+#define XSPI_SFAR_SFADR(x) ((x) << 0)
+
+#define XSPI_SMPR 0x108U
+
+#define XSPI_SMPR_DLLFSMPFA_MASK GENMASK(26, 24)
+#define XSPI_SMPR_DLLFSMPFA_SHIFT 24
+#define XSPI_SMPR_DLLFSMPFA(x) ((x) << 24)
+#define XSPI_SMPR_FSDLY_MASK BIT(6)
+#define XSPI_SMPR_FSDLY_SHIFT 6
+#define XSPI_SMPR_FSPHS_MASK BIT(5)
+#define XSPI_SMPR_FSPHS_SHIFT 5
+
+#define XSPI_RBSR 0x10CU
+
+#define XSPI_RBSR_RDCTR_MASK GENMASK(31, 16)
+#define XSPI_RBSR_RDCTR_SHIFT 16
+#define XSPI_RBSR_RDCTR(x) ((x) << 16)
+#define XSPI_RBSR_RDBFL_MASK GENMASK(8, 0)
+#define XSPI_RBSR_RDBFL_SHIFT 0
+#define XSPI_RBSR_RDBFL(x) ((x) << 0)
+
+#define XSPI_RBCT 0x110U
+
+#define XSPI_RBCT_WMRK_MASK GENMASK(8, 0)
+#define XSPI_RBCT_WMRK_SHIFT 0
+#define XSPI_RBCT_WMRK(x) ((x) << 0)
+
+#define XSPI_DLLSR 0x12CU
+
+#define XSPI_DLLSR_DLLA_LOCK_MASK BIT(15)
+#define XSPI_DLLSR_DLLA_LOCK_SHIFT 15
+#define XSPI_DLLSR_SLVA_LOCK_MASK BIT(14)
+#define XSPI_DLLSR_SLVA_LOCK_SHIFT 14
+#define XSPI_DLLSR_DLLA_RANGE_ERR_MASK BIT(13)
+#define XSPI_DLLSR_DLLA_RANGE_ERR_SHIFT 13
+#define XSPI_DLLSR_DLLA_FINE_UNDERFLOW_MASK BIT(12)
+#define XSPI_DLLSR_DLLA_FINE_UNDERFLOW_SHIFT 12
+#define XSPI_DLLSR_DLLA_SLV_FINE_VAL_MASK GENMASK(7, 4)
+#define XSPI_DLLSR_DLLA_SLV_FINE_VAL_SHIFT 4
+#define XSPI_DLLSR_DLLA_SLV_FINE_VAL(x) ((x) << 4)
+#define XSPI_DLLSR_DLLA_SLV_COARSE_VAL_MASK GENMASK(3, 0)
+#define XSPI_DLLSR_DLLA_SLV_COARSE_VAL_SHIFT 0
+#define XSPI_DLLSR_DLLA_SLV_COARSE_VAL(x) ((x) << 0)
+
+#define XSPI_DLCR 0x130U
+
+#define XSPI_DLCR_DL_NONDLP_FLSH_MASK BIT(24)
+#define XSPI_DLCR_DL_NONDLP_FLSH_SHIFT 24
+#define XSPI_DLCR_DLP_SEL_FA_MASK GENMASK(15, 14)
+#define XSPI_DLCR_DLP_SEL_FA_SHIFT 14
+#define XSPI_DLCR_DLP_SEL_FA(x) ((x) << 14)
+
+#define XSPI_TBSR 0x150U
+
+#define XSPI_TBSR_TRCTR_MASK GENMASK(31, 16)
+#define XSPI_TBSR_TRCTR_SHIFT 16
+#define XSPI_TBSR_TRCTR(x) ((x) << 16)
+#define XSPI_TBSR_TRBFL_MASK GENMASK(8, 0)
+#define XSPI_TBSR_TRBFL_SHIFT 0
+#define XSPI_TBSR_TRBFL(x) ((x) << 0)
+
+#define XSPI_TBDR 0x154U
+
+#define XSPI_TBDR_TXDATA_MASK GENMASK(31, 0)
+#define XSPI_TBDR_TXDATA_SHIFT 0
+#define XSPI_TBDR_TXDATA(x) ((x) << 0)
+
+#define XSPI_TBCT 0x158U
+
+#define XSPI_TBCT_WMRK_MASK GENMASK(7, 0)
+#define XSPI_TBCT_WMRK_SHIFT 0
+#define XSPI_TBCT_WMRK(x) ((x) << 0)
+
+#define XSPI_SR 0x15CU
+
+#define XSPI_SR_TXFULL_MASK BIT(27)
+#define XSPI_SR_TXFULL_SHIFT 27
+#define XSPI_SR_TXDMA_MASK BIT(26)
+#define XSPI_SR_TXDMA_SHIFT 26
+#define XSPI_SR_TXWA_MASK BIT(25)
+#define XSPI_SR_TXWA_SHIFT 25
+#define XSPI_SR_TXNE_MASK BIT(24)
+#define XSPI_SR_TXNE_SHIFT 24
+#define XSPI_SR_RXDMA_MASK BIT(23)
+#define XSPI_SR_RXDMA_SHIFT 23
+#define XSPI_SR_ARB_STATE_MASK GENMASK(22, 20)
+#define XSPI_SR_ARB_STATE_SHIFT 20
+#define XSPI_SR_ARB_STATE(x) ((x) << 20)
+#define XSPI_SR_RXFULL_MASK BIT(19)
+#define XSPI_SR_RXFULL_SHIFT 19
+#define XSPI_SR_RXWE_MASK BIT(16)
+#define XSPI_SR_RXWE_SHIFT 16
+#define XSPI_SR_ARB_LCK_MASK BIT(15)
+#define XSPI_SR_ARB_LCK_SHIFT 15
+#define XSPI_SR_AHBnFUL_MASK GENMASK(14, 11)
+#define XSPI_SR_AHBnFUL_SHIFT 11
+#define XSPI_SR_AHBnFUL(x) ((x) << 11)
+#define XSPI_SR_AHBnNE_MASK GENMASK(10, 7)
+#define XSPI_SR_AHBnNE_SHIFT 7
+#define XSPI_SR_AHBnNE(x) ((x) << 7)
+#define XSPI_SR_AHBTRN_MASK BIT(6)
+#define XSPI_SR_AHBTRN_SHIFT 6
+#define XSPI_SR_AWRACC_MASK BIT(4)
+#define XSPI_SR_AWRACC_SHIFT 4
+#define XSPI_SR_AHB_ACC_MASK BIT(2)
+#define XSPI_SR_AHB_ACC_SHIFT 2
+#define XSPI_SR_IP_ACC_MASK BIT(1)
+#define XSPI_SR_IP_ACC_SHIFT 1
+#define XSPI_SR_BUSY_MASK BIT(0)
+#define XSPI_SR_BUSY_SHIFT 0
+
+#define XSPI_FR 0x160U
+
+#define XSPI_FR_DLPFF_MASK BIT(31)
+#define XSPI_FR_DLPFF_SHIFT 31
+#define XSPI_FR_DLLABRT_MASK BIT(28)
+#define XSPI_FR_DLLABRT_SHIFT 28
+#define XSPI_FR_TBFF_MASK BIT(27)
+#define XSPI_FR_TBFF_SHIFT 27
+#define XSPI_FR_TBUF_MASK BIT(26)
+#define XSPI_FR_TBUF_SHIFT 26
+#define XSPI_FR_DLLUNLCK_MASK BIT(24)
+#define XSPI_FR_DLLUNLCK_SHIFT 24
+#define XSPI_FR_ILLINE_MASK BIT(23)
+#define XSPI_FR_ILLINE_SHIFT 23
+#define XSPI_FR_RBOF_MASK BIT(17)
+#define XSPI_FR_RBOF_SHIFT 17
+#define XSPI_FR_RBDF_MASK BIT(16)
+#define XSPI_FR_RBDF_SHIFT 16
+#define XSPI_FR_AAEF_MASK BIT(15)
+#define XSPI_FR_AAEF_SHIFT 15
+#define XSPI_FR_AITEF_MASK BIT(14)
+#define XSPI_FR_AITEF_SHIFT 14
+#define XSPI_FR_AIBSEF_MASK BIT(13)
+#define XSPI_FR_AIBSEF_SHIFT 13
+#define XSPI_FR_ABOF_MASK BIT(12)
+#define XSPI_FR_ABOF_SHIFT 12
+#define XSPI_FR_CRCAEF_MASK BIT(10)
+#define XSPI_FR_CRCAEF_SHIFT 10
+#define XSPI_FR_PPWF_MASK BIT(8)
+#define XSPI_FR_PPWF_SHIFT 8
+#define XSPI_FR_IPIEF_MASK BIT(6)
+#define XSPI_FR_IPIEF_SHIFT 6
+#define XSPI_FR_IPEDERR_MASK BIT(5)
+#define XSPI_FR_IPEDERR_SHIFT 5
+#define XSPI_FR_PERFOVF_MASK BIT(2)
+#define XSPI_FR_PERFOVF_SHIFT 2
+#define XSPI_FR_RDADDR_MASK BIT(1)
+#define XSPI_FR_RDADDR_SHIFT 1
+#define XSPI_FR_TFF_MASK BIT(0)
+#define XSPI_FR_TFF_SHIFT 0
+
+#define XSPI_SFA1AD 0x180U
+
+#define XSPI_SFA1AD_TPAD_MASK GENMASK(31, 10)
+#define XSPI_SFA1AD_TPAD_SHIFT 10
+#define XSPI_SFA1AD_TPAD(x) ((x) << 10)
+
+#define XSPI_SFA2AD 0x184U
+
+#define XSPI_DLPR 0x190U
+
+#define XSPI_DLPR_DLPV_MASK GENMASK(31, 0)
+#define XSPI_DLPR_DLPV_SHIFT 0
+#define XSPI_DLPR_DLPV(x) ((x) << 0)
+
+#define XSPI_RBDR 0x200U
+
+#define XSPI_LUTKEY 0x300U
+
+#define XSPI_LCKCR 0x304U
+
+#define XSPI_LCKCR_UNLOCK_MASK BIT(1)
+#define XSPI_LCKCR_UNLOCK_SHIFT 1
+#define XSPI_LCKCR_LOCK_MASK BIT(0)
+#define XSPI_LCKCR_LOCK_SHIFT 0
+
+#define XSPI_LUT			0x310
+
+#define XSPI_BFGENCR 0x20
+
+#define XSPI_BFGENCR_SEQID_WR_MASK GENMASK(31, 28)
+#define XSPI_BFGENCR_SEQID_WR_SHIFT 28
+#define XSPI_BFGENCR_SEQID_WR(x) ((x) << 28)
+#define XSPI_BFGENCR_ALIGN_MASK GENMASK(23, 22)
+#define XSPI_BFGENCR_ALIGN_SHIFT 22
+#define XSPI_BFGENCR_ALIGN(x) ((x) << 22)
+#define XSPI_BFGENCR_WR_FLUSH_EN_MASK BIT(21)
+#define XSPI_BFGENCR_WR_FLUSH_EN_SHIFT 21
+#define XSPI_BFGENCR_PPWF_CLR_MASK BIT(20)
+#define XSPI_BFGENCR_PPWF_CLR_SHIFT 20
+#define XSPI_BFGENCR_SEQID_WR_EN_MASK BIT(17)
+#define XSPI_BFGENCR_SEQID_WR_EN_SHIFT 17
+#define XSPI_BFGENCR_SEQID_MASK GENMASK(15, 12)
+#define XSPI_BFGENCR_SEQID_SHIFT 12
+#define XSPI_BFGENCR_SEQID(x) ((x) << 12)
+#define XSPI_BFGENCR_AHBSSIZE_MASK GENMASK(10, 9)
+#define XSPI_BFGENCR_AHBSSIZE_SHIFT 9
+#define XSPI_BFGENCR_AHBSSIZE(x) ((x) << 9)
+#define XSPI_BFGENCR_SPLITEN_MASK BIT(8)
+#define XSPI_BFGENCR_SPLITEN_SHIFT 8
+#define XSPI_BFGENCR_SEQID_RDSR_MASK GENMASK(3, 0)
+#define XSPI_BFGENCR_SEQID_RDSR_SHIFT 0
+#define XSPI_BFGENCR_SEQID_RDSR(x) ((x) << 0)
+
+#define XSPI_FRAD0_WORD2 0x808U
+
+#define XSPI_FRAD0_WORD2_EALO_MASK GENMASK(29, 24)
+#define XSPI_FRAD0_WORD2_EALO_SHIFT 24
+#define XSPI_FRAD0_WORD2_EALO(x) ((x) << 24)
+#define XSPI_FRAD0_WORD2_MD4ACP_MASK GENMASK(14, 12)
+#define XSPI_FRAD0_WORD2_MD4ACP_SHIFT 12
+#define XSPI_FRAD0_WORD2_MD4ACP(x) ((x) << 12)
+#define XSPI_FRAD0_WORD2_MD3ACP_MASK GENMASK(11, 9)
+#define XSPI_FRAD0_WORD2_MD3ACP_SHIFT 9
+#define XSPI_FRAD0_WORD2_MD3ACP(x) ((x) << 9)
+#define XSPI_FRAD0_WORD2_MD2ACP_MASK GENMASK(8, 6)
+#define XSPI_FRAD0_WORD2_MD2ACP_SHIFT 6
+#define XSPI_FRAD0_WORD2_MD2ACP(x) ((x) << 6)
+#define XSPI_FRAD0_WORD2_MD1ACP_MASK GENMASK(5, 3)
+#define XSPI_FRAD0_WORD2_MD1ACP_SHIFT 3
+#define XSPI_FRAD0_WORD2_MD1ACP(x) ((x) << 3)
+#define XSPI_FRAD0_WORD2_MD0ACP_MASK GENMASK(2, 0)
+#define XSPI_FRAD0_WORD2_MD0ACP_SHIFT 0
+#define XSPI_FRAD0_WORD2_MD0ACP(x) ((x) << 0)
+
+#define XSPI_FRAD1_WORD2 0x828U
+
+#define XSPI_FRAD2_WORD2 0x848U
+
+#define XSPI_FRAD3_WORD2 0x868U
+
+#define XSPI_FRAD4_WORD2 0x888U
+
+#define XSPI_FRAD5_WORD2 0x8A8U
+
+#define XSPI_FRAD6_WORD2 0x8C8U
+
+#define XSPI_FRAD7_WORD2 0x8E8U
+
+#define XSPI_FRAD8_WORD2 0x988U
+
+#define XSPI_FRAD9_WORD2 0x9A8U
+
+#define XSPI_FRAD10_WORD2 0x9C8U
+
+#define XSPI_FRAD11_WORD2 0x9E8U
+
+#define XSPI_FRAD12_WORD2 0xA08U
+
+#define XSPI_FRAD13_WORD2 0xA28U
+
+#define XSPI_FRAD14_WORD2 0xA48U
+
+#define XSPI_FRAD15_WORD2 0xA68U
+
+#define XSPI_FRAD0_WORD3 0x80CU
+
+#define XSPI_FRAD0_WORD3_VLD_MASK BIT(31)
+#define XSPI_FRAD0_WORD3_VLD_SHIFT 31
+#define XSPI_FRAD0_WORD3_LOCK_MASK GENMASK(30, 29)
+#define XSPI_FRAD0_WORD3_LOCK_SHIFT 29
+#define XSPI_FRAD0_WORD3_LOCK(x) ((x) << 29)
+#define XSPI_FRAD0_WORD3_EAL_MASK GENMASK(25, 24)
+#define XSPI_FRAD0_WORD3_EAL_SHIFT 24
+#define XSPI_FRAD0_WORD3_EAL(x) ((x) << 24)
+
+#define XSPI_FRAD1_WORD3 0x82CU
+
+#define XSPI_FRAD2_WORD3 0x84CU
+
+#define XSPI_FRAD3_WORD3 0x86CU
+
+#define XSPI_FRAD4_WORD3 0x88CU
+
+#define XSPI_FRAD5_WORD3 0x8ACU
+
+#define XSPI_FRAD6_WORD3 0x8CCU
+
+#define XSPI_FRAD7_WORD3 0x8ECU
+
+#define XSPI_FRAD8_WORD3 0x98CU
+
+#define XSPI_FRAD9_WORD3 0x9ACU
+
+#define XSPI_FRAD10_WORD3 0x9CCU
+
+#define XSPI_FRAD11_WORD3 0x9ECU
+
+#define XSPI_FRAD12_WORD3 0xA0CU
+
+#define XSPI_FRAD13_WORD3 0xA2CU
+
+#define XSPI_FRAD14_WORD3 0xA4CU
+
+#define XSPI_FRAD15_WORD3 0xA6CU
+
+#define XSPI_TG0MDAD 0x900U
+
+#define XSPI_TG0MDAD_VLD_MASK BIT(31)
+#define XSPI_TG0MDAD_VLD_SHIFT 31
+#define XSPI_TG0MDAD_LCK_MASK BIT(29)
+#define XSPI_TG0MDAD_LCK_SHIFT 29
+#define XSPI_TG0MDAD_SA_MASK GENMASK(15, 14)
+#define XSPI_TG0MDAD_SA_SHIFT 14
+#define XSPI_TG0MDAD_SA(x) ((x) << 14)
+#define XSPI_TG0MDAD_MASKTYPE_MASK BIT(12)
+#define XSPI_TG0MDAD_MASKTYPE_SHIFT 12
+#define XSPI_TG0MDAD_MASK_MASK GENMASK(11, 6)
+#define XSPI_TG0MDAD_MASK_SHIFT 6
+#define XSPI_TG0MDAD_MASK(x) ((x) << 6)
+#define XSPI_TG0MDAD_MIDMATCH_MASK GENMASK(5, 0)
+#define XSPI_TG0MDAD_MIDMATCH_SHIFT 0
+#define XSPI_TG0MDAD_MIDMATCH(x) ((x) << 0)
+
+#define XSPI_TG1MDAD 0x910U
+
+#define XSPI_MGC 0x920
+
+#define XSPI_MGC_GVLD_MASK BIT(31)
+#define XSPI_MGC_GVLD_SHIFT 31
+#define XSPI_MGC_GVLDMDAD_MASK BIT(29)
+#define XSPI_MGC_GVLDMDAD_SHIFT 29
+#define XSPI_MGC_GVLDFRAD_MASK BIT(27)
+#define XSPI_MGC_GVLDFRAD_SHIFT 27
+#define XSPI_MGC_TG1_FIX_PRIO_MASK BIT(16)
+#define XSPI_MGC_TG1_FIX_PRIO_SHIFT 16
+#define XSPI_MGC_GCLCK_MASK GENMASK(11, 10)
+#define XSPI_MGC_GCLCK_SHIFT 10
+#define XSPI_MGC_GCLCK(x) ((x) << 10)
+#define XSPI_MGC_GCLCKMID_MASK GENMASK(5, 0)
+#define XSPI_MGC_GCLCKMID_SHIFT 0
+#define XSPI_MGC_GCLCKMID(x) ((x) << 0)
+
+#define XSPI_MTO 0x928
+
+#define XSPI_MTO_SFP_ACC_TO_MASK GENMASK(31, 0)
+#define XSPI_MTO_SFP_ACC_TO_SHIFT 0
+#define XSPI_MTO_SFP_ACC_TO(x) ((x) << 0)
+
+#define XSPI_TG2MDAD_EXT 0x940U
+
+#define XSPI_TG2MDAD_EXT_VLD_MASK BIT(31)
+#define XSPI_TG2MDAD_EXT_VLD_SHIFT 31
+#define XSPI_TG2MDAD_EXT_LCK_MASK BIT(29)
+#define XSPI_TG2MDAD_EXT_LCK_SHIFT 29
+#define XSPI_TG2MDAD_EXT_SA_MASK GENMASK(15, 14)
+#define XSPI_TG2MDAD_EXT_SA_SHIFT 14
+#define XSPI_TG2MDAD_EXT_SA(x) ((x) << 14)
+#define XSPI_TG2MDAD_EXT_MASKTYPE_MASK BIT(12)
+#define XSPI_TG2MDAD_EXT_MASKTYPE_SHIFT 12
+#define XSPI_TG2MDAD_EXT_MASK_MASK GENMASK(11, 6)
+#define XSPI_TG2MDAD_EXT_MASK_SHIFT 6
+#define XSPI_TG2MDAD_EXT_MASK(x) ((x) << 6)
+#define XSPI_TG2MDAD_EXT_MIDMATCH_MASK GENMASK(5, 0)
+#define XSPI_TG2MDAD_EXT_MIDMATCH_SHIFT 0
+#define XSPI_TG2MDAD_EXT_MIDMATCH(x) ((x) << 0)
+
+#define XSPI_TG3MDAD_EXT 0x944U
+
+#define XSPI_TG4MDAD_EXT 0x948U
+
+#define XSPI_SFP_TG_IPCR 0x958U
+
+#define XSPI_SFP_TG_IPCR_SEQID_MASK GENMASK(27, 24)
+#define XSPI_SFP_TG_IPCR_SEQID_SHIFT 24
+#define XSPI_SFP_TG_IPCR_SEQID(x) ((x) << 24)
+#define XSPI_SFP_TG_IPCR_ARB_UNLOCK_MASK BIT(23)
+#define XSPI_SFP_TG_IPCR_ARB_UNLOCK_SHIFT 23
+#define XSPI_SFP_TG_IPCR_ARB_LOCK_MASK BIT(22)
+#define XSPI_SFP_TG_IPCR_ARB_LOCK_SHIFT 22
+#define XSPI_SFP_TG_IPCR_IDATSZ_MASK GENMASK(15, 0)
+#define XSPI_SFP_TG_IPCR_IDATSZ_SHIFT 0
+#define XSPI_SFP_TG_IPCR_IDATSZ(x) ((x) << 0)
+
+#define XSPI_SFP_TG_SFAR 0x95CU
+
+/* XSPI Register defination end */
+
+/* xspi data structure */
+struct nxp_xspi_devtype_data {
+	unsigned int rxfifo;
+	unsigned int rx_buf_size;
+	unsigned int txfifo;
+	unsigned int ahb_buf_size;
+	unsigned int quirks;
+};
+
+struct nxp_xspi {
+	struct udevice *dev;
+	u32 iobase;
+	u32 ahb_addr;
+	u32 a1_size;
+	u32 a2_size;
+	struct {
+		bool gmid:1;
+		u32 env:3;
+	} config;
+	struct clk clk;
+	struct nxp_xspi_devtype_data *devtype_data;
+	unsigned long support_max_rate;
+	int selected;
+	bool dtr;
+};
+
+/* xspi data structure end */
+
+/********* XSPI CMD definitions ***************************/
+#define CMD_SDR 0x01U
+#define CMD_DDR 0x11U
+#define RADDR_SDR 0x02U
+#define RADDR_DDR 0x0AU
+#define CADDR_SDR 0x12U
+#define CADDR_DDR 0x13U
+#define MODE2_SDR 0x05U
+#define MODE2_DDR 0x0CU
+#define MODE4_SDR 0x06U
+#define MODE4_DDR 0x0DU
+#define MODE8_SDR 0x04U
+#define MODE8_DDR 0x0BU
+#define WRITE_SDR 0x08U
+#define WRITE_DDR 0x0FU
+#define READ_SDR 0x07U
+#define READ_DDR 0x0EU
+#define DATA_LEARN 0x10U
+#define DUMMY_CYCLE 0x03U
+#define JMP_ON_CS 0x09U
+#define JMP_TO_SEQ 0x14U
+#define CMD_STOP 0U
+
+/********* XSPI PAD definitions ************/
+#define XSPI_1PAD 0U
+#define XSPI_2PAD 1U
+#define XSPI_4PAD 2U
+#define XSPI_8PAD 3U
+
+#define DEFAULT_XMIT_SIZE 0x40U
+
+#define ENV_ADDR_SIZE 0x10000
+
+#define XSPI_LUT_KEY_VAL		(0x5AF05AF0UL)
+
+#define xspi_get_reg_field(x, env, reg_name, field_name) \
+	({ \
+		u32 reg; \
+		reg = xspi_readl_offset(x, env, reg_name); \
+		reg &= XSPI_##reg_name##_##field_name##_MASK; \
+		reg = reg >> XSPI_##reg_name##_##field_name##_SHIFT; \
+		reg; \
+	})
+
+#define xspi_set_reg_field(x, env, val, reg_name, field_name) \
+	do { \
+		u32 reg; \
+		reg = xspi_readl_offset(x, env, reg_name); \
+		reg &= ~XSPI_##reg_name##_##field_name##_MASK; \
+		reg |= (val << XSPI_##reg_name##_##field_name##_SHIFT); \
+		xspi_writel_offset(x, env, reg, reg_name); \
+	} while (0)
+
+#define xspi_writel_offset(x, env, val, offset) \
+	do { \
+		out_le32((void __iomem *)(uintptr_t)x->iobase + \
+			 (env * ENV_ADDR_SIZE) + XSPI_##offset, val); \
+	} while (0)
+
+#define xspi_readl_offset(x, env, offset) ({ \
+	u32 reg; \
+	reg = in_le32((void __iomem *)(uintptr_t)x->iobase + \
+		      (env * ENV_ADDR_SIZE) + XSPI_##offset); \
+	reg; \
+})
+
+#define POLL_TOUT		5000
+
+#define CMD_LUT_FOR_IP_CMD 1
+#define CMD_LUT_FOR_AHB_CMD 0
+
+/*
+ * Calculate number of required PAD bits for LUT register.
+ *
+ * The pad stands for the number of IO lines [0:7].
+ * For example, the octal read needs eight IO lines,
+ * so you should use LUT_PAD(8). This macro
+ * returns 3 i.e. use eight (2^3) IP lines for read.
+ */
+#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 PAD_SHIFT		8
+#define INSTR_SHIFT		10
+#define OPRND_SHIFT		16
+
+/* Macros for constructing the LUT register. */
+#define LUT_DEF(idx, ins, pad, opr) \
+	((((ins) << INSTR_SHIFT) | ((pad) << PAD_SHIFT) | \
+	(opr)) << (((idx) % 2) * OPRND_SHIFT))
+
+#endif

-- 
2.43.0


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH v3 2/4] misc: ele_api: Add support for XSPI SET GMID command
  2026-03-03  1:10 [PATCH v3 0/4] Enable XSPI1 on i.MX943 EVK board alice.guo
  2026-03-03  1:10 ` [PATCH v3 1/4] spi: nxp_xspi: Add new driver for NXP XSPI controller alice.guo
@ 2026-03-03  1:10 ` alice.guo
  2026-03-03  3:29   ` Peng Fan
  2026-03-03  1:10 ` [PATCH v3 3/4] imx94_evk: Get ownership of XSPI control registers protected by GMID in SPL alice.guo
  2026-03-03  1:10 ` [PATCH v3 4/4] imx943_evk: Enable XSPI1 alice.guo
  3 siblings, 1 reply; 8+ messages in thread
From: alice.guo @ 2026-03-03  1:10 UTC (permalink / raw)
  To: NXP i.MX U-Boot Team, u-boot
  Cc: Tom Rini, Stefano Babic, Fabio Estevam, Greg Malysa,
	Arturs Artamonovs, Vasileios Bimpikas, Utsav Agarwal,
	Nathan Barrett-Morrison, Kuan-Wei Chiu, Jerome Forissier,
	Peng Fan, Raymond Mao, Neil Armstrong, Stefan Roese,
	Mattijs Korpershoek, Piotr Wojtaszczyk, Ralph Siemsen,
	Boon Khai Ng, Patrice Chotard, Christian Marangi, Ian Roberts,
	Ye Li, Jacky Bai, Marek Vasut, Sam Protsenko, Alice Guo

From: Ye Li <ye.li@nxp.com>

The XSPI SET GMID command is used to assign GMID ownership to the
requester, allowing access to protected XSPI control registers. This API
must be called in SPL if XSPI GMID-protected settings need to be
modified. Otherwise, XSPI configuration depends on the previous GMID
owner to provide the correct settings.

Signed-off-by: Ye Li <ye.li@nxp.com>
Signed-off-by: Alice Guo <alice.guo@nxp.com>
---
 arch/arm/include/asm/mach-imx/ele_api.h |  2 ++
 drivers/misc/imx_ele/ele_api.c          | 28 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/arch/arm/include/asm/mach-imx/ele_api.h b/arch/arm/include/asm/mach-imx/ele_api.h
index 4e1afc42bd8..04e7f20a2a6 100644
--- a/arch/arm/include/asm/mach-imx/ele_api.h
+++ b/arch/arm/include/asm/mach-imx/ele_api.h
@@ -49,6 +49,7 @@
 #define ELE_ATTEST_REQ (0xDB)
 #define ELE_RELEASE_PATCH_REQ (0xDC)
 #define ELE_OTP_SEQ_SWITH_REQ (0xDD)
+#define ELE_SET_GMID_REQ (0xE4)
 #define ELE_WRITE_SHADOW_REQ (0xF2)
 #define ELE_READ_SHADOW_REQ (0xF3)
 
@@ -162,6 +163,7 @@ int ele_return_lifecycle_update(ulong signed_msg_blk, u32 *response);
 int ele_start_rng(void);
 int ele_write_shadow_fuse(u32 fuse_id, u32 fuse_val, u32 *response);
 int ele_read_shadow_fuse(u32 fuse_id, u32 *fuse_val, u32 *response);
+int ele_set_gmid(u32 *response);
 int ele_volt_change_start_req(void);
 int ele_volt_change_finish_req(void);
 #endif
diff --git a/drivers/misc/imx_ele/ele_api.c b/drivers/misc/imx_ele/ele_api.c
index e7aee0fcef1..8ee0a7733ca 100644
--- a/drivers/misc/imx_ele/ele_api.c
+++ b/drivers/misc/imx_ele/ele_api.c
@@ -844,3 +844,31 @@ int ele_volt_change_finish_req(void)
 
 	return ret;
 }
+
+int ele_set_gmid(u32 *response)
+{
+	struct udevice *dev = gd->arch.ele_dev;
+	int size = sizeof(struct ele_msg);
+	struct ele_msg msg = {};
+	int ret;
+
+	if (!dev) {
+		printf("ele dev is not initialized\n");
+		return -ENODEV;
+	}
+
+	msg.version = ELE_VERSION;
+	msg.tag = ELE_CMD_TAG;
+	msg.size = 1;
+	msg.command = ELE_SET_GMID_REQ;
+
+	ret = misc_call(dev, false, &msg, size, &msg, size);
+	if (ret)
+		printf("Error: %s: ret %d, response 0x%x\n",
+		       __func__, ret, msg.data[0]);
+
+	if (response)
+		*response = msg.data[0];
+
+	return ret;
+}

-- 
2.43.0


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH v3 3/4] imx94_evk: Get ownership of XSPI control registers protected by GMID in SPL
  2026-03-03  1:10 [PATCH v3 0/4] Enable XSPI1 on i.MX943 EVK board alice.guo
  2026-03-03  1:10 ` [PATCH v3 1/4] spi: nxp_xspi: Add new driver for NXP XSPI controller alice.guo
  2026-03-03  1:10 ` [PATCH v3 2/4] misc: ele_api: Add support for XSPI SET GMID command alice.guo
@ 2026-03-03  1:10 ` alice.guo
  2026-03-03  3:30   ` Peng Fan
  2026-03-03  1:10 ` [PATCH v3 4/4] imx943_evk: Enable XSPI1 alice.guo
  3 siblings, 1 reply; 8+ messages in thread
From: alice.guo @ 2026-03-03  1:10 UTC (permalink / raw)
  To: NXP i.MX U-Boot Team, u-boot
  Cc: Tom Rini, Stefano Babic, Fabio Estevam, Greg Malysa,
	Arturs Artamonovs, Vasileios Bimpikas, Utsav Agarwal,
	Nathan Barrett-Morrison, Kuan-Wei Chiu, Jerome Forissier,
	Peng Fan, Raymond Mao, Neil Armstrong, Stefan Roese,
	Mattijs Korpershoek, Piotr Wojtaszczyk, Ralph Siemsen,
	Boon Khai Ng, Patrice Chotard, Christian Marangi, Ian Roberts,
	Ye Li, Jacky Bai, Marek Vasut, Sam Protsenko, Alice Guo

From: Ye Li <ye.li@nxp.com>

To gain access to certain registers that are protected by GMID, the SPL
must release XSPI ownership to the current core.

Signed-off-by: Ye Li <ye.li@nxp.com>
Signed-off-by: Alice Guo <alice.guo@nxp.com>
---
 board/nxp/imx94_evk/spl.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/board/nxp/imx94_evk/spl.c b/board/nxp/imx94_evk/spl.c
index cc5b7f9ef0f..6eb0fff99f4 100644
--- a/board/nxp/imx94_evk/spl.c
+++ b/board/nxp/imx94_evk/spl.c
@@ -46,6 +46,16 @@ void spl_board_init(void)
 		printf("Fail to start RNG: %d\n", ret);
 }
 
+static void xspi_nor_reset(void)
+{
+	int ret;
+	u32 resp = 0;
+
+	ret = ele_set_gmid(&resp);
+	if (ret)
+		printf("Fail to set GMID: %d, resp 0x%x\n", ret, resp);
+}
+
 /* SCMI support by default */
 void board_init_f(ulong dummy)
 {
@@ -76,5 +86,7 @@ void board_init_f(ulong dummy)
 
 	get_reset_reason(true, false);
 
+	xspi_nor_reset();
+
 	board_init_r(NULL, 0);
 }

-- 
2.43.0


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH v3 4/4] imx943_evk: Enable XSPI1
  2026-03-03  1:10 [PATCH v3 0/4] Enable XSPI1 on i.MX943 EVK board alice.guo
                   ` (2 preceding siblings ...)
  2026-03-03  1:10 ` [PATCH v3 3/4] imx94_evk: Get ownership of XSPI control registers protected by GMID in SPL alice.guo
@ 2026-03-03  1:10 ` alice.guo
  3 siblings, 0 replies; 8+ messages in thread
From: alice.guo @ 2026-03-03  1:10 UTC (permalink / raw)
  To: NXP i.MX U-Boot Team, u-boot
  Cc: Tom Rini, Stefano Babic, Fabio Estevam, Greg Malysa,
	Arturs Artamonovs, Vasileios Bimpikas, Utsav Agarwal,
	Nathan Barrett-Morrison, Kuan-Wei Chiu, Jerome Forissier,
	Peng Fan, Raymond Mao, Neil Armstrong, Stefan Roese,
	Mattijs Korpershoek, Piotr Wojtaszczyk, Ralph Siemsen,
	Boon Khai Ng, Patrice Chotard, Christian Marangi, Ian Roberts,
	Ye Li, Jacky Bai, Marek Vasut, Sam Protsenko, Alice Guo

From: Alice Guo <alice.guo@nxp.com>

With this patch, XSPI1 are functional on the i.MX943 EVK board.

Signed-off-by: Alice Guo <alice.guo@nxp.com>
---
 arch/arm/dts/imx943-evk-u-boot.dtsi | 34 ++++++++++++++++++++++++++++++++++
 arch/arm/dts/imx943-u-boot.dtsi     | 16 ++++++++++++++++
 configs/imx943_evk_defconfig        |  9 +++++++++
 3 files changed, 59 insertions(+)

diff --git a/arch/arm/dts/imx943-evk-u-boot.dtsi b/arch/arm/dts/imx943-evk-u-boot.dtsi
index 528b3b02a3f..247a7ed6838 100644
--- a/arch/arm/dts/imx943-evk-u-boot.dtsi
+++ b/arch/arm/dts/imx943-evk-u-boot.dtsi
@@ -157,6 +157,24 @@
 	status = "disabled";
 };
 
+&xspi1 {
+	bootph-pre-ram;
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_xspi1>;
+	status = "okay";
+
+	mt35xu512aba: flash@0 {
+		bootph-pre-ram;
+		reg = <0>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "jedec,spi-nor";
+		spi-max-frequency = <200000000>;
+		spi-tx-bus-width = <8>;
+		spi-rx-bus-width = <8>;
+	};
+};
+
 &scmi_iomuxc {
 	pinctrl_emdio: emdiogrp {
 		fsl,pins = <
@@ -205,6 +223,22 @@
 			IMX94_PAD_GPIO_IO17__LPI2C3_SCL		0x40000b9e
 		>;
 	};
+
+	pinctrl_xspi1: xspi1grp {
+		fsl,pins = <
+			IMX94_PAD_XSPI1_SCLK__XSPI1_A_SCLK	0x3fe
+			IMX94_PAD_XSPI1_SS0_B__XSPI1_A_SS0_B	0x3fe
+			IMX94_PAD_XSPI1_DATA0__XSPI1_A_DATA0	0x3fe
+			IMX94_PAD_XSPI1_DATA1__XSPI1_A_DATA1	0x3fe
+			IMX94_PAD_XSPI1_DATA2__XSPI1_A_DATA2	0x3fe
+			IMX94_PAD_XSPI1_DATA3__XSPI1_A_DATA3	0x3fe
+			IMX94_PAD_XSPI1_DATA4__XSPI1_A_DATA4	0x3fe
+			IMX94_PAD_XSPI1_DATA5__XSPI1_A_DATA5	0x3fe
+			IMX94_PAD_XSPI1_DATA6__XSPI1_A_DATA6	0x3fe
+			IMX94_PAD_XSPI1_DATA7__XSPI1_A_DATA7	0x3fe
+			IMX94_PAD_XSPI1_DQS__XSPI1_A_DQS	0x3fe
+		>;
+	};
 };
 
 &pinctrl_reg_usdhc2_vmmc {
diff --git a/arch/arm/dts/imx943-u-boot.dtsi b/arch/arm/dts/imx943-u-boot.dtsi
index 2b93ba9a38b..3457442a3b0 100644
--- a/arch/arm/dts/imx943-u-boot.dtsi
+++ b/arch/arm/dts/imx943-u-boot.dtsi
@@ -141,6 +141,22 @@
 
 &aips3 {
 	bootph-all;
+
+	xspi1: spi@42b90000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "nxp,imx94-xspi";
+		reg = <0x42b90000 0x50000>, <0x28000000 0x08000000>;
+		reg-names = "xspi_base", "xspi_mmap";
+		interrupts = <GIC_SPI 390 IRQ_TYPE_LEVEL_HIGH>,       // EENV0
+			     <GIC_SPI 391 IRQ_TYPE_LEVEL_HIGH>,	      // EENV1
+			     <GIC_SPI 392 IRQ_TYPE_LEVEL_HIGH>,       // EENV2
+			     <GIC_SPI 393 IRQ_TYPE_LEVEL_HIGH>,       // EENV3
+			     <GIC_SPI 394 IRQ_TYPE_LEVEL_HIGH>;       // EENV4
+		clocks = <&scmi_clk IMX94_CLK_XSPI1>;
+		clock-names = "xspi";
+		status = "disabled";
+	};
 };
 
 &clk_ext1 {
diff --git a/configs/imx943_evk_defconfig b/configs/imx943_evk_defconfig
index ef4f9a8fcbc..6acb49e47e2 100644
--- a/configs/imx943_evk_defconfig
+++ b/configs/imx943_evk_defconfig
@@ -107,6 +107,12 @@ CONFIG_I2C_MUX_PCA954x=y
 CONFIG_IMX_MU_MBOX=y
 CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_USDHC=y
+CONFIG_MTD=y
+CONFIG_DM_SPI_FLASH=y
+CONFIG_SPI_FLASH_SOFT_RESET=y
+CONFIG_SPI_FLASH_SOFT_RESET_ON_BOOT=y
+CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_FLASH_MT35XU=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_REALTEK=y
 CONFIG_DM_MDIO=y
@@ -127,6 +133,9 @@ CONFIG_DM_REGULATOR_GPIO=y
 CONFIG_DM_RTC=y
 CONFIG_DM_SERIAL=y
 CONFIG_FSL_LPUART=y
+CONFIG_SPI=y
+CONFIG_DM_SPI=y
+CONFIG_NXP_XSPI=y
 CONFIG_USB=y
 CONFIG_SPL_DM_USB_GADGET=y
 CONFIG_USB_XHCI_HCD=y

-- 
2.43.0


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH v3 1/4] spi: nxp_xspi: Add new driver for NXP XSPI controller
  2026-03-03  1:10 ` [PATCH v3 1/4] spi: nxp_xspi: Add new driver for NXP XSPI controller alice.guo
@ 2026-03-03  3:27   ` Peng Fan
  0 siblings, 0 replies; 8+ messages in thread
From: Peng Fan @ 2026-03-03  3:27 UTC (permalink / raw)
  To: alice.guo
  Cc: NXP i.MX U-Boot Team, u-boot, Tom Rini, Stefano Babic,
	Fabio Estevam, Greg Malysa, Arturs Artamonovs, Vasileios Bimpikas,
	Utsav Agarwal, Nathan Barrett-Morrison, Kuan-Wei Chiu,
	Jerome Forissier, Peng Fan, Raymond Mao, Neil Armstrong,
	Stefan Roese, Mattijs Korpershoek, Piotr Wojtaszczyk,
	Ralph Siemsen, Boon Khai Ng, Patrice Chotard, Christian Marangi,
	Ian Roberts, Ye Li, Jacky Bai, Marek Vasut, Sam Protsenko,
	Alice Guo

On Tue, Mar 03, 2026 at 09:10:26AM +0800, alice.guo@oss.nxp.com wrote:
>From: Alice Guo <alice.guo@nxp.com>
>
>Add new driver to support NXP XSPI controller for NOR and NAND flash.
>XSPI controller also uses a programmable sequence engine to provide
>flexibility to support existing and future memory devices. It supports
>single, dual, quad, octal modes of operation.
>
>Signed-off-by: Ye Li <ye.li@nxp.com>
>Signed-off-by: Alice Guo <alice.guo@nxp.com>
>---
> MAINTAINERS            |   1 +
> drivers/spi/Kconfig    |   8 +
> drivers/spi/Makefile   |   1 +
> drivers/spi/nxp_xspi.c | 881 +++++++++++++++++++++++++++++++++++++++++++++++++
> drivers/spi/nxp_xspi.h | 705 +++++++++++++++++++++++++++++++++++++++
> 5 files changed, 1596 insertions(+)
>
>diff --git a/MAINTAINERS b/MAINTAINERS
>index f8d4f6ee8b2..4e25679f0bf 100644
>--- a/MAINTAINERS
>+++ b/MAINTAINERS
>@@ -323,6 +323,7 @@ F:	doc/imx/
> F:	drivers/mailbox/imx-mailbox.c
> F:	drivers/remoteproc/imx*
> F:	drivers/serial/serial_mxc.c
>+F:	drivers/spi/nxp_xspi.c
> F:	include/imx_container.h
> 
> ARM HISILICON
>diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
>index 8c6c095a8cf..fb88175750f 100644
>--- a/drivers/spi/Kconfig
>+++ b/drivers/spi/Kconfig
>@@ -408,6 +408,14 @@ config NXP_FSPI
> 	  Enable the NXP FlexSPI (FSPI) driver. This driver can be used to
> 	  access the SPI NOR flash on platforms embedding this NXP IP core.
> 
>+config NXP_XSPI
>+	bool "NXP XSPI driver"
>+	depends on ARCH_IMX9
>+	depends on SPI_MEM
>+	help
>+	  Enable the NXP External SPI (XSPI) driver. This driver can be used to
>+	  access the SPI NOR/NAND flash on platforms embedding this NXP IP core.
>+
> config OCTEON_SPI
> 	bool "Octeon SPI driver"
> 	depends on ARCH_OCTEON || ARCH_OCTEONTX || ARCH_OCTEONTX2
>diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
>index 0dc2d23e172..13d9c5dce80 100644
>--- a/drivers/spi/Makefile
>+++ b/drivers/spi/Makefile
>@@ -61,6 +61,7 @@ obj-$(CONFIG_MXS_SPI) += mxs_spi.o
> obj-$(CONFIG_NPCM_FIU_SPI) += npcm_fiu_spi.o
> obj-$(CONFIG_NPCM_PSPI) += npcm_pspi.o
> obj-$(CONFIG_NXP_FSPI) += nxp_fspi.o
>+obj-$(CONFIG_NXP_XSPI) += nxp_xspi.o
> obj-$(CONFIG_ATCSPI200_SPI) += atcspi200_spi.o
> obj-$(CONFIG_OCTEON_SPI) += octeon_spi.o
> obj-$(CONFIG_OMAP3_SPI) += omap3_spi.o
>diff --git a/drivers/spi/nxp_xspi.c b/drivers/spi/nxp_xspi.c
>new file mode 100644
>index 00000000000..d5ac4f46c05
>--- /dev/null
>+++ b/drivers/spi/nxp_xspi.c
>@@ -0,0 +1,881 @@
>+// SPDX-License-Identifier: GPL-2.0+
>+/*
>+ * Copyright 2025 NXP
>+ */
>+
>+#include <asm/arch/clock.h>
>+#include <asm/io.h>
>+#include <clk.h>
>+#include <dm.h>
>+#include <dm/device_compat.h>
>+#include <linux/bitops.h>
>+#include <linux/bug.h>
>+#include <linux/err.h>
>+#include <linux/iopoll.h>
>+#include <linux/kernel.h>
>+#include <linux/sizes.h>
>+#include <log.h>
>+#include <malloc.h>
>+#include <spi.h>
>+#include <spi-mem.h>
>+
>+#include "nxp_xspi.h"
>+
>+static inline void xspi_writel(struct nxp_xspi *x, u32 val, u32 addr)
>+{
>+	void __iomem *_addr = (void __iomem *)(uintptr_t)addr;
>+
>+	out_le32(_addr, val);
>+};
>+
>+static inline u32 xspi_readl(struct nxp_xspi *x, u32 addr)
>+{
>+	return in_le32((uintptr_t)addr);
>+};

Use 1 or 2.
1(Just example code): 
static inline void xspi_writel(struct nxp_xspi *x, u32 val, u32 offset)
{
	out_le32(_addr, x->iobase + offset);
};

static inline u32 xspi_readl(struct nxp_xspi *x, u32 offset)
{
	return in_le32(x->base + offset);
};

2:
drop the above two helpers and directly using readl/writel in the whole file.

>+
>+#define xspi_config_sfp_tg(x, env, sfar, ipcr) \
>+	do { \
>+		xspi_writel_offset(x, env, (sfar), SFP_TG_SFAR); \
>+		xspi_writel_offset(x, env, (ipcr), SFP_TG_IPCR); \
>+	} while (0)
>+
>+static int xspi_readl_poll_tout(struct nxp_xspi *x, int env, u32 offset,
>+				u32 mask, u32 delay_us,
>+				u32 timeout_us, bool c)

"c" is hard to guess its meaning, rename it.

>+{
>+	u32 reg;
>+	void __iomem *addr = (void __iomem *)(uintptr_t)x->iobase + (env * ENV_ADDR_SIZE) + offset;
>+
>+	if (c)
>+		return readl_poll_sleep_timeout(addr, reg, (reg & mask),
>+						delay_us, timeout_us);
>+	else
>+		return readl_poll_sleep_timeout(addr, reg, !(reg & mask),
>+						delay_us, timeout_us);
>+};
>+
>+static struct nxp_xspi_devtype_data imx94_data = {
>+	.rxfifo = SZ_512,	/* RX fifo Size*/
>+	.rx_buf_size = 64 * 4, /* RBDR buffer size */
>+	.txfifo = SZ_1K,
>+	.ahb_buf_size = SZ_4K,
>+	.quirks = 0,
>+};
>+
>+static const struct udevice_id nxp_xspi_ids[] = {
>+	{ .compatible = "nxp,imx94-xspi", .data = (ulong)&imx94_data, },
>+	{ }
>+};
>+
>+static int nxp_xspi_claim_bus(struct udevice *dev)
>+{
>+	return 0;
>+}
>+
>+#if CONFIG_IS_ENABLED(CLK)
>+static int nxp_xspi_clk_prep_enable(struct nxp_xspi *x)
>+{
>+	int ret;
>+
>+	ret = clk_enable(&x->clk);
>+	if (ret)
>+		return ret;
>+
>+	return 0;


"return clk_enable(&x->clk);"

>+};
>+
>+static void nxp_xspi_clk_disable_unprep(struct nxp_xspi *x)
>+{
>+	clk_disable(&x->clk);
>+};
>+#endif
>+
>+static int xspi_swreset(struct nxp_xspi *x)
>+{
>+	u32 reg;
>+
>+	reg = xspi_readl_offset(x, 0, MCR);
>+	reg |= (XSPI_MCR_SWRSTHD_MASK | XSPI_MCR_SWRSTSD_MASK);
>+	xspi_writel_offset(x, 0, reg, MCR);
>+	udelay(2);
>+	reg &= ~(XSPI_MCR_SWRSTHD_MASK | XSPI_MCR_SWRSTSD_MASK);
>+	xspi_writel_offset(x, 0, reg, MCR);
>+
>+	return 0;
>+};
>+
>+static void nxp_xspi_dll_bypass(struct nxp_xspi *x)
>+{
>+	u32 reg;
>+	int ret;
>+
>+	xspi_swreset(x);
>+
>+	xspi_writel_offset(x, 0, 0, DLLCRA);
>+
>+	reg = XSPI_DLLCRA_SLV_EN_MASK;
>+	xspi_writel_offset(x, 0, reg, DLLCRA);
>+
>+	reg = XSPI_DLLCRA_FREQEN_MASK | XSPI_DLLCRA_SLV_EN_MASK |
>+		XSPI_DLLCRA_SLV_DLL_BYPASS_MASK | XSPI_DLLCRA_SLV_DLY_COARSE(7);
>+	xspi_writel_offset(x, 0, reg, DLLCRA);
>+
>+	reg |= XSPI_DLLCRA_SLV_UPD_MASK;
>+	xspi_writel_offset(x, 0, reg, DLLCRA);
>+
>+	ret = xspi_readl_poll_tout(x, 0, XSPI_DLLSR, XSPI_DLLSR_SLVA_LOCK_MASK, 1, POLL_TOUT, true);
>+	WARN_ON(ret);

Should it continue or error return?

>+
>+	reg &= ~XSPI_DLLCRA_SLV_UPD_MASK;
>+	xspi_writel_offset(x, 0, reg, DLLCRA);
>+}
>+
>+static void nxp_xspi_dll_auto(struct nxp_xspi *x, unsigned long rate)
>+{
>+	u32 reg;
>+	int ret;
>+
>+	xspi_swreset(x);
>+
>+	xspi_writel_offset(x, 0, 0, DLLCRA);
>+
>+	reg = XSPI_DLLCRA_SLV_EN_MASK;
>+	xspi_writel_offset(x, 0, reg, DLLCRA);
>+
>+	reg = XSPI_DLLCRA_DLL_REFCNTR(2) | XSPI_DLLCRA_DLLRES(8) |
>+		XSPI_DLLCRA_SLAVE_AUTO_UPDT_MASK | XSPI_DLLCRA_SLV_EN_MASK;
>+	if (rate > MHZ(133))
>+		reg |= XSPI_DLLCRA_FREQEN_MASK;
>+
>+	xspi_writel_offset(x, 0, reg, DLLCRA);
>+
>+	reg |= XSPI_DLLCRA_SLV_UPD_MASK;
>+	xspi_writel_offset(x, 0, reg, DLLCRA);
>+
>+	reg |= XSPI_DLLCRA_DLLEN_MASK;
>+	xspi_writel_offset(x, 0, reg, DLLCRA);
>+
>+	ret = xspi_readl_poll_tout(x, 0, XSPI_DLLSR,
>+				   XSPI_DLLSR_DLLA_LOCK_MASK | XSPI_DLLSR_SLVA_LOCK_MASK,
>+				   1, POLL_TOUT, true);
>+	WARN_ON(ret);

Ditto.

>+}
>+
>+static void nxp_xspi_disable_ddr(struct nxp_xspi *x)
>+{
>+	u32 reg;
>+
>+	reg = xspi_readl_offset(x, 0, MCR);
>+	reg |= XSPI_MCR_MDIS_MASK;
>+	xspi_writel_offset(x, 0, reg, MCR);
>+
>+	reg &= ~(XSPI_MCR_DQS_EN_MASK | XSPI_MCR_DDR_EN_MASK);
>+	reg &= ~XSPI_MCR_DQS_FA_SEL_MASK;
>+	reg |= XSPI_MCR_DQS_FA_SEL(1);
>+	xspi_writel_offset(x, 0, reg, MCR);
>+
>+	reg = xspi_readl_offset(x, 0, FLSHCR);
>+	reg &= ~XSPI_FLSHCR_TDH_MASK;
>+	xspi_writel_offset(x, 0, reg, FLSHCR);
>+
>+	xspi_writel_offset(x, 0, XSPI_SMPR_DLLFSMPFA(7), SMPR);
>+
>+	reg = xspi_readl_offset(x, 0, MCR);
>+	reg &= ~XSPI_MCR_MDIS_MASK;
>+	xspi_writel_offset(x, 0, reg, MCR);
>+
>+	x->support_max_rate = MHZ(133);
>+}
>+
>+static void nxp_xspi_enable_ddr(struct nxp_xspi *x)
>+{
>+	u32 reg;
>+
>+	reg = xspi_readl_offset(x, 0, MCR);
>+	reg |= XSPI_MCR_MDIS_MASK;
>+	xspi_writel_offset(x, 0, reg, MCR);
>+
>+	reg |= XSPI_MCR_DQS_EN_MASK | XSPI_MCR_DDR_EN_MASK;
>+	reg &= ~XSPI_MCR_DQS_FA_SEL_MASK;
>+	reg |= XSPI_MCR_DQS_FA_SEL(3);
>+	xspi_writel_offset(x, 0, reg, MCR);
>+
>+	reg = xspi_readl_offset(x, 0, FLSHCR);
>+	reg |= XSPI_FLSHCR_TDH(1);
>+	xspi_writel_offset(x, 0, reg, FLSHCR);
>+
>+	xspi_writel_offset(x, 0, XSPI_SMPR_DLLFSMPFA(4), SMPR);
>+
>+	reg = xspi_readl_offset(x, 0, MCR);
>+	reg &= ~XSPI_MCR_MDIS_MASK;
>+	xspi_writel_offset(x, 0, reg, MCR);
>+
>+	x->support_max_rate = MHZ(200);
>+}
>+
>+static int nxp_xspi_set_speed(struct udevice *bus, uint speed)
>+{
>+	printf("%s: %u\n", __func__, speed);

This is for debug? if yes, change to debug and move the end of the function.

>+#if CONFIG_IS_ENABLED(CLK)
>+	struct nxp_xspi *x = dev_get_priv(bus);
>+	int ret;
>+
>+	nxp_xspi_clk_disable_unprep(x);
>+
>+	ret = clk_set_rate(&x->clk, speed);
>+	if (ret < 0)
>+		return ret;
>+
>+	ret = nxp_xspi_clk_prep_enable(x);
>+	if (ret)
>+		return ret;
>+
>+	xspi_swreset(x);
>+#endif
>+	return 0;
>+}
>+
>+static int nxp_xspi_set_mode(struct udevice *bus, uint mode)
>+{
>+	return 0;
>+}
>+
>+static int nxp_xspi_adjust_op_size(struct spi_slave *slave,
>+				   struct spi_mem_op *op)
>+{
>+	struct nxp_xspi *x;
>+	struct udevice *bus;
>+
>+	bus = slave->dev->parent;
>+	x = dev_get_priv(bus);
>+
>+	if (op->data.dir == SPI_MEM_DATA_OUT) {
>+		if (op->data.nbytes > x->devtype_data->txfifo)
>+			op->data.nbytes = x->devtype_data->txfifo;
>+	} else {
>+		if (op->data.nbytes > x->devtype_data->ahb_buf_size)
>+			op->data.nbytes = x->devtype_data->ahb_buf_size;
>+		else if (op->data.nbytes > x->devtype_data->rxfifo)
>+			op->data.nbytes = ALIGN_DOWN(op->data.nbytes, 8);
>+	}
>+
>+	return 0;
>+}
>+
>+static int nxp_xspi_check_buswidth(struct nxp_xspi *x, u8 width)
>+{
>+	switch (width) {
>+	case 1:
>+	case 2:
>+	case 4:
>+	case 8:
>+		return 0;
>+	}
>+
>+	return -ENOTSUPP;
>+}
>+
>+static bool nxp_xspi_supports_op(struct spi_slave *slave,
>+				 const struct spi_mem_op *op)
>+{
>+	struct nxp_xspi *x;
>+	struct udevice *bus;
>+	int ret;
>+
>+	bus = slave->dev->parent;
>+	x = dev_get_priv(bus);
>+
>+	ret = nxp_xspi_check_buswidth(x, op->cmd.buswidth);
>+
>+	if (op->addr.nbytes)
>+		ret |= nxp_xspi_check_buswidth(x, op->addr.buswidth);
>+
>+	if (op->dummy.nbytes)
>+		ret |= nxp_xspi_check_buswidth(x, op->dummy.buswidth);
>+
>+	if (op->data.nbytes)
>+		ret |= nxp_xspi_check_buswidth(x, op->data.buswidth);
>+
>+	if (ret)
>+		return false;
>+
>+	/*
>+	 * The number of address bytes should be equal to or less than 4 bytes.
>+	 */
>+	if (op->addr.nbytes > 4)
>+		return false;
>+
>+	/*
>+	 * If requested address value is greater than controller assigned
>+	 * memory mapped space, return error as it didn't fit in the range
>+	 * of assigned address space.
>+	 */
>+	if (op->addr.val >= x->a1_size + x->a2_size)
>+		return false;
>+
>+	/* Max 64 dummy clock cycles supported */
>+	if (op->dummy.buswidth &&
>+	    (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 > x->devtype_data->ahb_buf_size ||
>+	     (op->data.nbytes > x->devtype_data->rxfifo &&
>+	      !IS_ALIGNED(op->data.nbytes, 8))))
>+		return false;
>+
>+	if (op->data.dir == SPI_MEM_DATA_OUT &&
>+	    op->data.nbytes > x->devtype_data->txfifo)
>+		return false;
>+
>+	if (op->cmd.dtr)
>+		return spi_mem_dtr_supports_op(slave, op);
>+	else
>+		return spi_mem_default_supports_op(slave, op);
>+}
>+
>+static int xspi_update_lut(struct nxp_xspi *x, u32 seq_index, const u32 *lut_base, u32 num_of_seq)
>+{
>+	int ret;
>+
>+	ret = xspi_readl_poll_tout(x, 0, XSPI_SR, XSPI_SR_BUSY_MASK, 1, POLL_TOUT, false);
>+	WARN_ON(ret);

Should continue or error return, please fix globally?

>+
>+	xspi_writel_offset(x, 0, XSPI_LUT_KEY_VAL, LUTKEY);
>+	xspi_writel_offset(x, 0, 0x2, LCKCR);
>+
>+	for (int i = 0; i < num_of_seq * 5; i++)

No use magic number, what does 5 meaning?

>+		xspi_writel(x, *(lut_base + i), x->iobase + XSPI_LUT + (seq_index * 5 + i) * 4);
>+
>+	xspi_writel_offset(x, 0, XSPI_LUT_KEY_VAL, LUTKEY);
>+	xspi_writel_offset(x, 0, 0x1, LCKCR);
>+
>+	return 0;
>+}
>+
>+static void nxp_xspi_prepare_lut(struct nxp_xspi *x,
>+				 const struct spi_mem_op *op)
>+{
>+	u32 lutval[5] = {0};
>+	int lutidx = 1;
>+
>+	/* cmd */
>+	if (op->cmd.dtr) {
>+		lutval[0] |= LUT_DEF(0, CMD_DDR, LUT_PAD(op->cmd.buswidth),
>+				     op->cmd.opcode >> 8);
>+		lutval[lutidx / 2] |= LUT_DEF(lutidx, CMD_DDR,
>+					      LUT_PAD(op->cmd.buswidth),
>+					      op->cmd.opcode & 0x00ff);
>+		lutidx++;
>+	} else {
>+		lutval[0] |= LUT_DEF(0, CMD_SDR, LUT_PAD(op->cmd.buswidth),
>+				     op->cmd.opcode);
>+	}
>+
>+	/* addr bytes */
>+	if (op->addr.nbytes) {
>+		lutval[lutidx / 2] |= LUT_DEF(lutidx, op->addr.dtr ?  RADDR_DDR : RADDR_SDR,
>+					      LUT_PAD(op->addr.buswidth),
>+					      op->addr.nbytes * 8);
>+		lutidx++;
>+	}
>+
>+	/* dummy bytes, if needed */
>+	if (op->dummy.nbytes) {
>+		lutval[lutidx / 2] |= LUT_DEF(lutidx, DUMMY_CYCLE,
>+					      LUT_PAD(op->data.buswidth),
>+					      op->dummy.nbytes * 8 /
>+					      op->dummy.buswidth / (op->dummy.dtr ? 2 : 1));
>+		lutidx++;
>+	}
>+
>+	/* read/write data bytes */
>+	if (op->data.nbytes) {
>+		lutval[lutidx / 2] |= LUT_DEF(lutidx,
>+					      op->data.dir == SPI_MEM_DATA_IN ?
>+					      (op->data.dtr ? READ_DDR : READ_SDR) :
>+					      (op->data.dtr ? WRITE_DDR : WRITE_SDR),
>+					      LUT_PAD(op->data.buswidth),
>+					      0);
>+		lutidx++;
>+	}
>+
>+	/* stop condition. */
>+	lutval[lutidx / 2] |= LUT_DEF(lutidx, CMD_STOP, 0, 0);
>+#ifdef DEBUG
>+	print_buffer(0, lutval, 4, lutidx / 2 + 1, 4);
>+#endif
>+	xspi_update_lut(x, CMD_LUT_FOR_IP_CMD, lutval, 1);
>+
>+	if (op->data.nbytes &&
>+	    (op->data.dir == SPI_MEM_DATA_IN || op->data.dir == SPI_MEM_DATA_OUT) &&
>+	    op->addr.nbytes)
>+		xspi_update_lut(x, CMD_LUT_FOR_AHB_CMD, lutval, 1);
>+}
>+
>+static void nxp_xspi_read_ahb(struct nxp_xspi *x, const struct spi_mem_op *op)
>+{
>+	u32 len = op->data.nbytes;
>+
>+	/* Read out the data directly from the AHB buffer. */
>+	memcpy_fromio(op->data.buf.in, (void *)(uintptr_t)(x->ahb_addr + op->addr.val), len);
>+}
>+
>+static void nxp_xspi_fill_txfifo(struct nxp_xspi *x,
>+				 const struct spi_mem_op *op)
>+{
>+	const u8 *buf = (u8 *)op->data.buf.out;
>+	int xfer_remaining_size = op->data.nbytes;
>+	u32 reg, val = 0;
>+	int ret;
>+
>+	/* clear the TX FIFO. */
>+	xspi_set_reg_field(x, x->config.env, 1, MCR, CLR_TXF);
>+	ret = xspi_readl_poll_tout(x, x->config.env, XSPI_MCR,
>+				   XSPI_MCR_CLR_TXF_MASK, 1, POLL_TOUT, false);
>+	WARN_ON(ret);
>+
>+	reg = XSPI_TBCT_WMRK((x->devtype_data->txfifo - ALIGN_DOWN(op->data.nbytes, 4)) / 4 + 1);
>+	xspi_writel_offset(x, x->config.env, reg, TBCT);
>+
>+	reg = x->ahb_addr + op->addr.val;
>+	xspi_writel_offset(x, x->config.env, reg, SFP_TG_SFAR);
>+
>+	udelay(2);
>+	reg = XSPI_SFP_TG_IPCR_SEQID(CMD_LUT_FOR_IP_CMD) | XSPI_SFP_TG_IPCR_IDATSZ(op->data.nbytes);
>+	u64 start = timer_get_us();
>+
>+	xspi_writel_offset(x, x->config.env, reg, SFP_TG_IPCR);
>+
>+	while (xfer_remaining_size > 0) {
>+		if (xspi_get_reg_field(x, x->config.env, SR, TXFULL))
>+			continue;
>+
>+		if (xfer_remaining_size > 4) {
>+			memcpy(&val, buf, 4);
>+			buf += 4;
>+		} else {
>+			val = 0;
>+			memcpy(&val, buf, xfer_remaining_size);
>+			buf += xfer_remaining_size;
>+		}
>+
>+		xspi_writel_offset(x, x->config.env, val, TBDR);
>+		xfer_remaining_size -= 4;
>+
>+		if (xspi_get_reg_field(x, x->config.env, FR, ILLINE))
>+			break;
>+	}
>+
>+	/* Wait for controller being ready. */
>+	ret = xspi_readl_poll_tout(x, x->config.env, XSPI_SR,
>+				   XSPI_SR_BUSY_MASK, 1, POLL_TOUT, false);
>+	WARN_ON(ret);
>+
>+	u32 trctr = xspi_get_reg_field(x, x->config.env, TBSR, TRCTR);
>+
>+	if ((ALIGN(op->data.nbytes, 4) / 4) != trctr)
>+		dev_dbg(x->dev, "Fail to write data. tx_size = %u, trctr = %u.\n",
>+			op->data.nbytes, trctr * 4);
>+
>+	dev_dbg(x->dev, "tx data size: %u bytes, spend: %llu us\r\n",
>+		op->data.nbytes, timer_get_us() - start);
>+}
>+
>+static void nxp_xspi_read_rxfifo(struct nxp_xspi *x,
>+				 const struct spi_mem_op *op)
>+{
>+	u32 reg;
>+	int ret, i;
>+	u32 val;
>+
>+	u8 *buf = op->data.buf.in;
>+
>+	reg = XSPI_RBCT_WMRK(x->devtype_data->rx_buf_size / 4 - 1);
>+	xspi_writel_offset(x, x->config.env, reg, RBCT);
>+
>+	/* clear the TX FIFO. */
>+	xspi_set_reg_field(x, x->config.env, 1, MCR, CLR_RXF);
>+	ret = xspi_readl_poll_tout(x, x->config.env, XSPI_MCR,
>+				   XSPI_MCR_CLR_RXF_MASK, 1, POLL_TOUT, false);
>+	WARN_ON(ret);
>+
>+	xspi_writel_offset(x, x->config.env,  x->ahb_addr + op->addr.val, SFP_TG_SFAR);
>+	reg = XSPI_SFP_TG_IPCR_SEQID(CMD_LUT_FOR_IP_CMD) | XSPI_SFP_TG_IPCR_IDATSZ(op->data.nbytes);
>+	u64 start = timer_get_us();
>+
>+	xspi_writel_offset(x, x->config.env, reg, SFP_TG_IPCR);
>+
>+	ret = xspi_readl_poll_tout(x, x->config.env, XSPI_SR, XSPI_SR_BUSY_MASK, 1,
>+				   POLL_TOUT, false);
>+	WARN_ON(ret);
>+
>+	for (i = 0; i < ALIGN_DOWN(op->data.nbytes, 4); i += 4) {
>+		if (i == x->devtype_data->rx_buf_size) {
>+			reg = xspi_readl_offset(x, x->config.env, FR);
>+			reg |= XSPI_FR_RBDF_MASK;
>+			xspi_writel_offset(x, x->config.env, reg, FR);
>+		}
>+		val = xspi_readl(x, x->iobase + (x->config.env * ENV_ADDR_SIZE) +
>+				 XSPI_RBDR + (i % x->devtype_data->rx_buf_size));
>+		memcpy(buf + i, &val, 4);
>+	}
>+
>+	if (i < op->data.nbytes) {
>+		val = xspi_readl(x, x->iobase + (x->config.env * ENV_ADDR_SIZE) +
>+				 XSPI_RBDR + (i % x->devtype_data->rx_buf_size));
>+		memcpy(buf + i, &val, op->data.nbytes - i);
>+	}
>+
>+	/* clear the RX FIFO. */
>+	xspi_set_reg_field(x, x->config.env, 1, MCR, CLR_RXF);
>+	ret = xspi_readl_poll_tout(x, x->config.env, XSPI_MCR,
>+				   XSPI_MCR_CLR_RXF_MASK, 1, POLL_TOUT, false);
>+	WARN_ON(ret);
>+
>+	dev_dbg(x->dev, "rx data size: %u bytes, spend: %llu us\r\n",
>+		op->data.nbytes, timer_get_us() - start);
>+}
>+
>+static int nxp_xspi_xfer_cmd(struct nxp_xspi *x, const struct spi_mem_op *op)
>+{
>+	u32 reg;
>+	int ret;
>+
>+	xspi_writel_offset(x, x->config.env, x->ahb_addr + op->addr.val, SFP_TG_SFAR);
>+	reg = XSPI_SFP_TG_IPCR_SEQID(CMD_LUT_FOR_IP_CMD) | XSPI_SFP_TG_IPCR_IDATSZ(op->data.nbytes);
>+	xspi_writel_offset(x, x->config.env, reg, SFP_TG_IPCR);
>+
>+	/* Wait for controller being ready. */
>+	ret = xspi_readl_poll_tout(x, x->config.env, XSPI_SR, XSPI_SR_BUSY_MASK, 1,
>+				   POLL_TOUT, false);
>+	WARN_ON(ret);
>+
>+	return 0;
>+}
>+
>+static void nxp_xspi_select_mem(struct nxp_xspi *xspi, struct spi_slave *slave,
>+				const struct spi_mem_op *op)
>+{
>+	unsigned long rate = slave->max_hz;
>+
>+	if (xspi->selected == spi_chip_select(slave->dev) &&
>+		xspi->dtr == op->cmd.dtr)
>+		return;
>+
>+	if (!op->cmd.dtr) {
>+		nxp_xspi_disable_ddr(xspi);
>+		rate = min(xspi->support_max_rate, rate);
>+		xspi->dtr = false;
>+	} else {
>+		nxp_xspi_enable_ddr(xspi);
>+		rate = min(xspi->support_max_rate, rate);
>+		rate *= 2;
>+		xspi->dtr = true;
>+	}
>+
>+#if CONFIG_IS_ENABLED(CLK)
>+	int ret;
>+
>+	nxp_xspi_clk_disable_unprep(xspi);
>+
>+	ret = clk_set_rate(&xspi->clk, rate);
>+	if (ret < 0)
>+		return;
>+
>+	ret = nxp_xspi_clk_prep_enable(xspi);
>+	if (ret)
>+		return;
>+#endif
>+
>+	xspi->selected = spi_chip_select(slave->dev);
>+
>+	if (!op->cmd.dtr || rate < MHZ(60))
>+		nxp_xspi_dll_bypass(xspi);
>+	else
>+		nxp_xspi_dll_auto(xspi, rate);
>+}
>+
>+static int nxp_xspi_exec_op(struct spi_slave *slave,
>+			    const struct spi_mem_op *op)
>+{
>+	struct nxp_xspi *x;
>+	struct udevice *bus;
>+	int err = 0;
>+
>+	bus = slave->dev->parent;
>+	x = dev_get_priv(bus);
>+
>+	dev_dbg(bus, "%s:%s:%d\n", __FILE__, __func__, __LINE__);
>+	dev_dbg(bus, "buswidth = %u, nbytes = %u, dtr = %u, opcode = 0x%x\n",
>+		op->cmd.buswidth, op->cmd.nbytes, op->cmd.dtr, op->cmd.opcode);
>+	dev_dbg(bus, "buswidth = %u, nbytes = %u, dtr = %u, val = 0x%llx\n",
>+		op->addr.buswidth, op->addr.nbytes, op->addr.dtr, op->addr.val);
>+	dev_dbg(bus, "buswidth = %u, nbytes = %u, dtr = %u\n",
>+		op->dummy.buswidth, op->dummy.nbytes, op->dummy.dtr);
>+	dev_dbg(bus, "buswidth = %u, nbytes = %u, dtr = %u, dir = %u, buf = 0x%llx\n",
>+		op->data.buswidth, op->data.nbytes, op->data.dtr, op->data.dir,
>+		(u64)op->data.buf.in);
>+
>+	nxp_xspi_select_mem(x, slave, op);
>+
>+	nxp_xspi_prepare_lut(x, op);
>+	/*
>+	 * 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. Read via AHB bus may be corrupted due to
>+	 * existence of an errata and therefore discard AHB read in such cases.
>+	 */
>+	if (op->data.nbytes > (x->config.gmid ? x->devtype_data->rxfifo : DEFAULT_XMIT_SIZE) &&
>+	    op->data.dir == SPI_MEM_DATA_IN) {
>+		dev_dbg(bus, "ahb read\n");
>+		nxp_xspi_read_ahb(x, op);
>+	} else {
>+		dev_dbg(bus, "ip command\n");
>+		/* Wait for controller being ready. */
>+		err = xspi_readl_poll_tout(x, x->config.env, XSPI_SR, XSPI_SR_BUSY_MASK,
>+					   1, POLL_TOUT, false);
>+		WARN_ON(err);
>+
>+		xspi_writel_offset(x, x->config.env, GENMASK(31, 0), FR);
>+
>+		if (op->data.nbytes) {
>+			if (op->data.dir == SPI_MEM_DATA_OUT)
>+				nxp_xspi_fill_txfifo(x, op);
>+			else if (op->data.dir == SPI_MEM_DATA_IN)
>+				nxp_xspi_read_rxfifo(x, op);
>+			else
>+				dev_dbg(x->dev, "%d: never should happen\r\n", __LINE__);
>+		} else {
>+			nxp_xspi_xfer_cmd(x, op);
>+		}
>+	}
>+
>+#ifdef DEBUG
>+	if (op->data.nbytes <= 10)
>+		if (op->data.dir != SPI_MEM_NO_DATA)
>+			print_buffer(0, op->data.buf.out, 1, op->data.nbytes, 16);
>+#endif
>+
>+	return err;
>+}
>+
>+static const struct spi_controller_mem_ops nxp_xspi_mem_ops = {
>+	.adjust_op_size = nxp_xspi_adjust_op_size,
>+	.supports_op = nxp_xspi_supports_op,
>+	.exec_op = nxp_xspi_exec_op,
>+};
>+
>+static const struct dm_spi_ops nxp_xspi_ops = {
>+	.claim_bus	= nxp_xspi_claim_bus,
>+	.set_speed	= nxp_xspi_set_speed,
>+	.set_mode	= nxp_xspi_set_mode,
>+	.mem_ops        = &nxp_xspi_mem_ops,
>+};
>+
>+static int nxp_xspi_of_to_plat(struct udevice *bus)
>+{
>+	struct nxp_xspi *x = dev_get_priv(bus);
>+	fdt_addr_t iobase;
>+	fdt_addr_t iobase_size;
>+	fdt_addr_t ahb_addr;
>+	fdt_addr_t ahb_size;
>+
>+#if CONFIG_IS_ENABLED(CLK)
>+	int ret;
>+#endif
>+
>+	x->dev = bus;
>+
>+	iobase = devfdt_get_addr_size_name(bus, "xspi_base", &iobase_size);
>+	if (iobase == FDT_ADDR_T_NONE) {
>+		dev_err(bus, "xspi_base regs missing\n");
>+		return -ENODEV;
>+	}
>+	x->iobase = iobase;
>+
>+	ahb_addr = devfdt_get_addr_size_name(bus, "xspi_mmap", &ahb_size);
>+	if (ahb_addr == FDT_ADDR_T_NONE) {
>+		dev_err(bus, "xspi_mmap regs missing\n");
>+		return -ENODEV;
>+	}
>+	x->ahb_addr = ahb_addr;
>+	x->a1_size = ahb_size;
>+	x->a2_size = 0;
>+	x->config.gmid = true;
>+	x->config.env = 0;
>+
>+#if CONFIG_IS_ENABLED(CLK)
>+	ret = clk_get_by_name(bus, "xspi", &x->clk);
>+	if (ret) {
>+		dev_err(bus, "failed to get xspi clock\n");
>+		return ret;
>+	}
>+#endif
>+
>+	dev_dbg(bus, "iobase=<0x%x>, ahb_addr=<0x%x>, a1_size=<0x%x>, a2_size=<0x%x>, env=<0x%x>, gmid=<0x%x>\n",
>+		x->iobase, x->ahb_addr, x->a1_size, x->a2_size, x->config.env, x->config.gmid);
>+
>+	return 0;
>+}
>+
>+static int nxp_xspi_config_ahb_buffers(struct nxp_xspi *x)
>+{
>+	u32 reg;
>+
>+	reg = XSPI_BUF3CR_MSTRID(0xa);
>+	xspi_writel_offset(x, 0, reg, BUF0CR);
>+	reg = XSPI_BUF3CR_MSTRID(0x2);
>+	xspi_writel_offset(x, 0, reg, BUF1CR);
>+	reg = XSPI_BUF3CR_MSTRID(0xd);
>+	xspi_writel_offset(x, 0, reg, BUF2CR);
>+
>+	reg = XSPI_BUF3CR_MSTRID(0x6) | XSPI_BUF3CR_ALLMST_MASK;
>+	reg |= XSPI_BUF3CR_ADATSZ(x->devtype_data->ahb_buf_size / 8U);
>+	xspi_writel_offset(x, 0, reg, BUF3CR);
>+
>+	/* Only the buffer3 is used */
>+	xspi_writel_offset(x, 0, 0, BUF0IND);
>+	xspi_writel_offset(x, 0, 0, BUF1IND);
>+	xspi_writel_offset(x, 0, 0, BUF2IND);
>+
>+	/* Program the Sequence ID for read/write operation. */
>+	reg = XSPI_BFGENCR_SEQID_WR_EN_MASK | XSPI_BFGENCR_SEQID(CMD_LUT_FOR_AHB_CMD);
>+	xspi_writel_offset(x, 0, reg, BFGENCR);
>+
>+	/* AHB access towards flash is broken if this AHB alignment boundary is crossed */
>+	/* 0-No limit 1-256B 10-512B 11b-limit */
>+	xspi_set_reg_field(x, 0, 0, BFGENCR, ALIGN);
>+
>+	return 0;
>+};
>+
>+static void nxp_xspi_config_mdad(struct nxp_xspi *x)
>+{
>+	xspi_writel_offset(x, 0, XSPI_TG2MDAD_EXT_VLD_MASK, TG0MDAD);
>+	xspi_writel_offset(x, 0, XSPI_TG2MDAD_EXT_VLD_MASK, TG1MDAD);
>+	xspi_writel_offset(x, 0, XSPI_TG2MDAD_EXT_VLD_MASK, TG2MDAD_EXT);
>+	xspi_writel_offset(x, 0, XSPI_TG2MDAD_EXT_VLD_MASK, TG3MDAD_EXT);
>+	xspi_writel_offset(x, 0, XSPI_TG2MDAD_EXT_VLD_MASK, TG4MDAD_EXT);
>+}
>+
>+static void nxp_xspi_config_frad(struct nxp_xspi *x)
>+{
>+	/* Enable Read/Write Access permissions & Valid */
>+	for (int i = 0; i < 8; i++) {
>+		xspi_writel(x, XSPI_FRAD0_WORD2_MD0ACP_MASK | XSPI_FRAD0_WORD2_MD1ACP_MASK,
>+			    x->iobase + XSPI_FRAD0_WORD2 + (i * 0x20U));
>+		xspi_writel(x, XSPI_FRAD0_WORD3_VLD_MASK,
>+			    x->iobase + XSPI_FRAD0_WORD3 + (i * 0x20U));
>+	}
>+	for (int i = 0; i < 8; i++) {
>+		xspi_writel(x, XSPI_FRAD0_WORD2_MD0ACP_MASK | XSPI_FRAD0_WORD2_MD1ACP_MASK,
>+			    x->iobase + XSPI_FRAD8_WORD2 + (i * 0x20U));
>+		xspi_writel(x, XSPI_FRAD0_WORD3_VLD_MASK,
>+			    x->iobase + XSPI_FRAD8_WORD3 + (i * 0x20U));
>+	}
>+}
>+
>+static int nxp_xspi_default_setup(struct nxp_xspi *x)
>+{
>+	int ret = 0;
>+	u32 reg;
>+
>+#if CONFIG_IS_ENABLED(CLK)
>+	ret = clk_set_rate(&x->clk, 20UL * 1000000UL);
>+	if (ret < 0) {
>+		dev_err(x->dev, "clk_set_rate fail\n");
>+		return ret;

could assigned_clock_rates be used to replace the code here?

>+	}
>+	dev_dbg(x->dev, "clk rate = %lu\n", clk_get_rate(&x->clk));
>+
>+	ret = nxp_xspi_clk_prep_enable(x);
>+	if (ret) {
>+		dev_err(x->dev, "nxp_xspi_clk_prep_enable fail\n");
>+		return ret;
>+	}
>+#endif
>+
>+	if (x->config.gmid) {
>+		reg = xspi_readl_offset(x, 0, MGC);
>+		reg &= ~(XSPI_MGC_GVLD_MASK | XSPI_MGC_GVLDMDAD_MASK | XSPI_MGC_GVLDFRAD_MASK);
>+		xspi_writel_offset(x, 0, reg, MGC);
>+
>+		xspi_writel_offset(x, 0, GENMASK(31, 0), MTO);
>+	}
>+
>+	nxp_xspi_config_mdad(x);
>+	nxp_xspi_config_frad(x);
>+
>+	xspi_set_reg_field(x, 0, 0, MCR, MDIS);
>+
>+	xspi_swreset(x);
>+
>+	xspi_set_reg_field(x, 0, 1, MCR, MDIS);
>+
>+	reg = xspi_readl_offset(x, 0, MCR);
>+	reg &= ~(XSPI_MCR_END_CFG_MASK | XSPI_MCR_DQS_FA_SEL_MASK |
>+		 XSPI_MCR_DDR_EN_MASK | XSPI_MCR_DQS_EN_MASK | XSPI_MCR_CKN_FA_EN_MASK |
>+		 XSPI_MCR_DQS_OUT_EN_MASK | XSPI_MCR_ISD2FA_MASK | XSPI_MCR_ISD3FA_MASK);
>+
>+	reg |= XSPI_MCR_ISD2FA_MASK;
>+	reg |= XSPI_MCR_ISD3FA_MASK;
>+
>+	reg |= XSPI_MCR_END_CFG(3);
>+
>+	xspi_writel_offset(x, 0, reg, MCR);
>+
>+	reg = xspi_readl_offset(x, 0, SFACR);
>+
>+	reg &= ~(uint32_t)(XSPI_SFACR_CAS_MASK | XSPI_SFACR_WA_MASK |
>+			   XSPI_SFACR_BYTE_SWAP_MASK | XSPI_SFACR_WA_4B_EN_MASK |
>+			   XSPI_SFACR_FORCE_A10_MASK);
>+
>+	xspi_writel_offset(x, 0, reg, SFACR);
>+
>+	nxp_xspi_config_ahb_buffers(x);
>+
>+	reg = XSPI_FLSHCR_TCSH(3) | XSPI_FLSHCR_TCSS(3);
>+	xspi_writel_offset(x, 0, reg, FLSHCR);
>+
>+	xspi_writel_offset(x, 0, x->ahb_addr + x->a1_size, SFA1AD);
>+	xspi_writel_offset(x, 0, x->ahb_addr + x->a1_size + x->a2_size, SFA2AD);
>+
>+	reg = XSPI_SMPR_DLLFSMPFA(7);
>+	xspi_writel_offset(x, 0, reg, SMPR);
>+
>+	xspi_set_reg_field(x, 0, 0, MCR, MDIS);
>+
>+	xspi_swreset(x);
>+
>+	x->selected = -1;
>+
>+	return ret;
>+};
>+
>+static int nxp_xspi_probe(struct udevice *bus)
>+{
>+	int ret;
>+	struct nxp_xspi *x = dev_get_priv(bus);
>+
>+	x->devtype_data =
>+		(struct nxp_xspi_devtype_data *)dev_get_driver_data(bus);
>+
>+	ret = nxp_xspi_default_setup(x);
>+	if (ret)
>+		dev_err(x->dev, "nxp_xspi_default_setup fail %d\n", ret);
>+
>+	return ret;
>+};
>+
>+U_BOOT_DRIVER(nxp_xspi) = {
>+	.name	= "nxp_xspi",
>+	.id	= UCLASS_SPI,
>+	.of_match = nxp_xspi_ids,
>+	.ops	= &nxp_xspi_ops,
>+	.of_to_plat = nxp_xspi_of_to_plat,
>+	.priv_auto	= sizeof(struct nxp_xspi),
>+	.probe	= nxp_xspi_probe,
>+	.flags		= DM_FLAG_PRE_RELOC,
>+};
>diff --git a/drivers/spi/nxp_xspi.h b/drivers/spi/nxp_xspi.h
>new file mode 100644
>index 00000000000..0072f90b613
>--- /dev/null
>+++ b/drivers/spi/nxp_xspi.h
>@@ -0,0 +1,705 @@
>+/* SPDX-License-Identifier: GPL-2.0+ */
>+/*
>+ * Copyright 2025 NXP
>+ */
>+
>+#ifndef __NXP_XSPI_H
>+#define __NXP_XSPI_H
>+
>+/* XSPI Register defination */
>+
>+#define XSPI_MCR 0x0
>+

Use tab to align all below macros.

>+#define XSPI_MCR_CKN_FA_EN_MASK BIT(26)
>+#define XSPI_MCR_CKN_FA_EN_SHIFT 26
>+#define XSPI_MCR_DQS_FA_SEL_MASK GENMASK(25, 24)
>+#define XSPI_MCR_DQS_FA_SEL_SHIFT 24
>+#define XSPI_MCR_DQS_FA_SEL(x) ((x) << 24)
>+#define XSPI_MCR_ISD3FA_MASK BIT(17)
>+#define XSPI_MCR_ISD3FA_SHIFT 17
>+#define XSPI_MCR_ISD3FA_MASK BIT(17)
>+#define XSPI_MCR_ISD3FA_SHIFT 17
>+#define XSPI_MCR_ISD2FA_MASK BIT(16)
>+#define XSPI_MCR_ISD2FA_SHIFT 16
>+#define XSPI_MCR_DOZE_MASK BIT(15)
>+#define XSPI_MCR_DOZE_SHIFT 15
>+#define XSPI_MCR_MDIS_MASK BIT(14)
>+#define XSPI_MCR_MDIS_SHIFT 14
>+#define XSPI_MCR_DLPEN_MASK BIT(12)
>+#define XSPI_MCR_DLPEN_SHIFT 12
>+#define XSPI_MCR_CLR_TXF_MASK BIT(11)
>+#define XSPI_MCR_CLR_TXF_SHIFT 11
>+#define XSPI_MCR_CLR_RXF_MASK BIT(10)
>+#define XSPI_MCR_CLR_RXF_SHIFT 10
>+#define XSPI_MCR_IPS_TG_RST_MASK BIT(9)
>+#define XSPI_MCR_IPS_TG_RST_SHIFT 9
>+#define XSPI_MCR_VAR_LAT_EN_MASK BIT(8)
>+#define XSPI_MCR_VAR_LAT_EN_SHIFT 8
>+#define XSPI_MCR_DDR_EN_MASK BIT(7)
>+#define XSPI_MCR_DDR_EN_SHIFT 7
>+#define XSPI_MCR_DQS_EN_MASK BIT(6)
>+#define XSPI_MCR_DQS_EN_SHIFT 6
>+#define XSPI_MCR_DQS_LAT_EN_MASK BIT(5)
>+#define XSPI_MCR_DQS_LAT_EN_SHIFT 5
>+#define XSPI_MCR_DQS_OUT_EN_MASK BIT(4)
>+#define XSPI_MCR_DQS_OUT_EN_SHIFT 4
>+#define XSPI_MCR_END_CFG_MASK GENMASK(3, 2)
>+#define XSPI_MCR_END_CFG_SHIFT 2
>+#define XSPI_MCR_END_CFG(x) ((x) << 2)
>+#define XSPI_MCR_SWRSTHD_MASK BIT(1)
>+#define XSPI_MCR_SWRSTHD_SHIFT 1
>+#define XSPI_MCR_SWRSTSD_MASK BIT(0)
>+#define XSPI_MCR_SWRSTSD_SHIFT 0
>+
>+#define XSPI_IPCR 0x8U
>+
>+#define XSPI_IPCR_SEQID_MASK GENMASK(27, 24)
>+#define XSPI_IPCR_SEQID_SHIFT 24
>+#define XSPI_IPCR_SEQID(x) ((x) << 24)
>+#define XSPI_IPCR_IDATSZ_MASK GENMASK(14, 0)
>+#define XSPI_IPCR_IDATSZ_SHIFT 0
>+#define XSPI_IPCR_IDATSZ(x) ((x) << 0)
>+
>+#define XSPI_FLSHCR 0xCU
>+
>+#define XSPI_FLSHCR_TDH_MASK GENMASK(17, 16)
>+#define XSPI_FLSHCR_TDH_SHIFT 16
>+#define XSPI_FLSHCR_TDH(x) ((x) << 16)
>+#define XSPI_FLSHCR_TCSH_MASK GENMASK(11, 8)
>+#define XSPI_FLSHCR_TCSH_SHIFT 8
>+#define XSPI_FLSHCR_TCSH(x) ((x) << 8)
>+#define XSPI_FLSHCR_TCSS_MASK GENMASK(3, 0)
>+#define XSPI_FLSHCR_TCSS_SHIFT 0
>+#define XSPI_FLSHCR_TCSS(x) ((x) << 0)
>+
>+#define XSPI_BUF0CR 0x010U
>+
>+#define XSPI_BUF0CR_HP_EN_MASK BIT(31)
>+#define XSPI_BUF0CR_HP_EN_SHIFT 31
>+#define XSPI_BUF0CR_SUB_DIV_EN_MASK BIT(30)
>+#define XSPI_BUF0CR_SUB_DIV_EN_SHIFT 30
>+#define XSPI_BUF0CR_SUBBUF2_DIV_MASK GENMASK(29, 27)
>+#define XSPI_BUF0CR_SUBBUF2_DIV_SHIFT 27
>+#define XSPI_BUF0CR_SUBBUF2_DIV(x) ((x) << 27)
>+#define XSPI_BUF0CR_SUBBUF1_DIV_MASK GENMASK(26, 24)
>+#define XSPI_BUF0CR_SUBBUF1_DIV_SHIFT 24
>+#define XSPI_BUF0CR_SUBBUF1_DIV(x) ((x) << 24)
>+#define XSPI_BUF0CR_SUBBUF0_DIV_MASK GENMASK(23, 21)
>+#define XSPI_BUF0CR_SUBBUF0_DIV_SHIFT 21
>+#define XSPI_BUF0CR_SUBBUF0_DIV(x) ((x) << 21)
>+#define XSPI_BUF0CR_ADATSZ_MASK GENMASK(17, 8)
>+#define XSPI_BUF0CR_ADATSZ_SHIFT 8
>+#define XSPI_BUF0CR_ADATSZ(x) ((x) << 8)
>+#define XSPI_BUF0CR_MSTRID_MASK GENMASK(3, 0)
>+#define XSPI_BUF0CR_MSTRID_SHIFT 0
>+#define XSPI_BUF0CR_MSTRID(x) ((x) << 0)
>+
>+#define XSPI_BUF1CR 0x014U
>+
>+#define XSPI_BUF2CR 0x018U
>+
>+#define XSPI_BUF3CR 0x1CU
>+
>+#define XSPI_BUF3CR_ALLMST_MASK BIT(31)
>+#define XSPI_BUF3CR_ALLMST_SHIFT 31
>+#define XSPI_BUF3CR_SUB_DIV_EN_MASK BIT(30)
>+#define XSPI_BUF3CR_SUB_DIV_EN_SHIFT 30
>+#define XSPI_BUF3CR_SUBBUF2_DIV_MASK GENMASK(29, 27)
>+#define XSPI_BUF3CR_SUBBUF2_DIV_SHIFT 27
>+#define XSPI_BUF3CR_SUBBUF2_DIV(x) ((x) << 27)
>+#define XSPI_BUF3CR_SUBBUF1_DIV_MASK GENMASK(26, 24)
>+#define XSPI_BUF3CR_SUBBUF1_DIV_SHIFT 24
>+#define XSPI_BUF3CR_SUBBUF1_DIV(x) ((x) << 24)
>+#define XSPI_BUF3CR_SUBBUF0_DIV_MASK GENMASK(23, 21)
>+#define XSPI_BUF3CR_SUBBUF0_DIV_SHIFT 21
>+#define XSPI_BUF3CR_SUBBUF0_DIV(x) ((x) << 21)
>+#define XSPI_BUF3CR_ADATSZ_MASK GENMASK(17, 8)
>+#define XSPI_BUF3CR_ADATSZ_SHIFT 8
>+#define XSPI_BUF3CR_ADATSZ(x) ((x) << 8)
>+#define XSPI_BUF3CR_MSTRID_MASK GENMASK(3, 0)
>+#define XSPI_BUF3CR_MSTRID_SHIFT 0
>+#define XSPI_BUF3CR_MSTRID(x) ((x) << 0)
>+
>+#define XSPI_BUF0IND 0x030U
>+
>+#define XSPI_BUF0IND_TPINDX_MASK GENMASK(12, 3)
>+#define XSPI_BUF0IND_TPINDX_SHIFT 3
>+#define XSPI_BUF0IND_TPINDX(x) ((x) << 3)
>+
>+#define XSPI_BUF1IND 0x034U
>+
>+#define XSPI_BUF2IND 0x038U
>+
>+#define XSPI_AWRCR 0x50
>+
>+#define XSPI_AWRCR_PPW_WR_DIS_MASK BIT(15)
>+#define XSPI_AWRCR_PPW_WR_DIS_SHIFT 15
>+#define XSPI_AWRCR_PPW_RD_DIS_MASK BIT(14)
>+#define XSPI_AWRCR_PPW_RD_DIS_SHIFT 14
>+
>+#define XSPI_DLLCRA 0x60U
>+
>+#define XSPI_DLLCRA_DLLEN_MASK BIT(31)
>+#define XSPI_DLLCRA_DLLEN_SHIFT 31
>+#define XSPI_DLLCRA_FREQEN_MASK BIT(30)
>+#define XSPI_DLLCRA_FREQEN_SHIFT 30
>+#define XSPI_DLLCRA_DLL_REFCNTR_MASK GENMASK(27, 24)
>+#define XSPI_DLLCRA_DLL_REFCNTR_SHIFT 24
>+#define XSPI_DLLCRA_DLL_REFCNTR(x) ((x) << 24)
>+#define XSPI_DLLCRA_DLLRES_MASK GENMASK(23, 20)
>+#define XSPI_DLLCRA_DLLRES_SHIFT 20
>+#define XSPI_DLLCRA_DLLRES(x) ((x) << 20)
>+#define XSPI_DLLCRA_SLV_FINE_OFFSET_MASK GENMASK(19, 16)
>+#define XSPI_DLLCRA_SLV_FINE_OFFSET_SHIFT 16
>+#define XSPI_DLLCRA_SLV_FINE_OFFSET(x) ((x) << 16)
>+#define XSPI_DLLCRA_SLV_DLY_OFFSET_MASK GENMASK(14, 12)
>+#define XSPI_DLLCRA_SLV_DLY_OFFSET_SHIFT 12
>+#define XSPI_DLLCRA_SLV_DLY_OFFSET(x) ((x) << 12)
>+#define XSPI_DLLCRA_SLV_DLY_COARSE_MASK GENMASK(11, 8)
>+#define XSPI_DLLCRA_SLV_DLY_COARSE_SHIFT 8
>+#define XSPI_DLLCRA_SLV_DLY_COARSE(x) ((x) << 8)
>+#define XSPI_DLLCRA_SLV_DLY_FINE_MASK GENMASK(7, 5)
>+#define XSPI_DLLCRA_SLV_DLY_FINE_SHIFT 5
>+#define XSPI_DLLCRA_SLV_DLY_FINE(x) ((x) << 5)
>+#define XSPI_DLLCRA_DLL_CDL8_MASK BIT(4)
>+#define XSPI_DLLCRA_DLL_CDL8_SHIFT 4
>+#define XSPI_DLLCRA_SLAVE_AUTO_UPDT_MASK BIT(3)
>+#define XSPI_DLLCRA_SLAVE_AUTO_UPDT_SHIFT 3
>+#define XSPI_DLLCRA_SLV_EN_MASK BIT(2)
>+#define XSPI_DLLCRA_SLV_EN_SHIFT 2
>+#define XSPI_DLLCRA_SLV_DLL_BYPASS_MASK BIT(1)
>+#define XSPI_DLLCRA_SLV_DLL_BYPASS_SHIFT 1
>+#define XSPI_DLLCRA_SLV_UPD_MASK BIT(0)
>+#define XSPI_DLLCRA_SLV_UPD_SHIFT 0
>+
>+#define XSPI_SFACR 0x104U
>+
>+#define XSPI_SFACR_FORCE_A10_MASK BIT(22)
>+#define XSPI_SFACR_FORCE_A10_SHIFT 22
>+#define XSPI_SFACR_WA_4B_EN_MASK BIT(21)
>+#define XSPI_SFACR_WA_4B_EN_SHIFT 21
>+#define XSPI_SFACR_CAS_INTRLVD_MASK BIT(20)
>+#define XSPI_SFACR_CAS_INTRLVD_SHIFT 20
>+#define XSPI_SFACR_RX_BP_EN_MASK BIT(18)
>+#define XSPI_SFACR_RX_BP_EN_SHIFT 18
>+#define XSPI_SFACR_BYTE_SWAP_MASK BIT(17)
>+#define XSPI_SFACR_BYTE_SWAP_SHIFT 17
>+#define XSPI_SFACR_WA_MASK BIT(16)
>+#define XSPI_SFACR_WA_SHIFT 16
>+#define XSPI_SFACR_PPWB_MASK GENMASK(12, 8)
>+#define XSPI_SFACR_PPWB_SHIFT 8
>+#define XSPI_SFACR_PPWB(x) ((x) << 8)
>+#define XSPI_SFACR_CAS_MASK GENMASK(3, 0)
>+#define XSPI_SFACR_CAS_SHIFT 0
>+#define XSPI_SFACR_CAS(x) ((x) << 0)
>+
>+#define XSPI_SFAR 0x100U
>+
>+#define XSPI_SFAR_SFADR_MASK GENMASK(31, 0)
>+#define XSPI_SFAR_SFADR_SHIFT 0
>+#define XSPI_SFAR_SFADR(x) ((x) << 0)
>+
>+#define XSPI_SMPR 0x108U
>+
>+#define XSPI_SMPR_DLLFSMPFA_MASK GENMASK(26, 24)
>+#define XSPI_SMPR_DLLFSMPFA_SHIFT 24
>+#define XSPI_SMPR_DLLFSMPFA(x) ((x) << 24)
>+#define XSPI_SMPR_FSDLY_MASK BIT(6)
>+#define XSPI_SMPR_FSDLY_SHIFT 6
>+#define XSPI_SMPR_FSPHS_MASK BIT(5)
>+#define XSPI_SMPR_FSPHS_SHIFT 5
>+
>+#define XSPI_RBSR 0x10CU
>+
>+#define XSPI_RBSR_RDCTR_MASK GENMASK(31, 16)
>+#define XSPI_RBSR_RDCTR_SHIFT 16
>+#define XSPI_RBSR_RDCTR(x) ((x) << 16)
>+#define XSPI_RBSR_RDBFL_MASK GENMASK(8, 0)
>+#define XSPI_RBSR_RDBFL_SHIFT 0
>+#define XSPI_RBSR_RDBFL(x) ((x) << 0)
>+
>+#define XSPI_RBCT 0x110U
>+
>+#define XSPI_RBCT_WMRK_MASK GENMASK(8, 0)
>+#define XSPI_RBCT_WMRK_SHIFT 0
>+#define XSPI_RBCT_WMRK(x) ((x) << 0)
>+
>+#define XSPI_DLLSR 0x12CU
>+
>+#define XSPI_DLLSR_DLLA_LOCK_MASK BIT(15)
>+#define XSPI_DLLSR_DLLA_LOCK_SHIFT 15
>+#define XSPI_DLLSR_SLVA_LOCK_MASK BIT(14)
>+#define XSPI_DLLSR_SLVA_LOCK_SHIFT 14
>+#define XSPI_DLLSR_DLLA_RANGE_ERR_MASK BIT(13)
>+#define XSPI_DLLSR_DLLA_RANGE_ERR_SHIFT 13
>+#define XSPI_DLLSR_DLLA_FINE_UNDERFLOW_MASK BIT(12)
>+#define XSPI_DLLSR_DLLA_FINE_UNDERFLOW_SHIFT 12
>+#define XSPI_DLLSR_DLLA_SLV_FINE_VAL_MASK GENMASK(7, 4)
>+#define XSPI_DLLSR_DLLA_SLV_FINE_VAL_SHIFT 4
>+#define XSPI_DLLSR_DLLA_SLV_FINE_VAL(x) ((x) << 4)
>+#define XSPI_DLLSR_DLLA_SLV_COARSE_VAL_MASK GENMASK(3, 0)
>+#define XSPI_DLLSR_DLLA_SLV_COARSE_VAL_SHIFT 0
>+#define XSPI_DLLSR_DLLA_SLV_COARSE_VAL(x) ((x) << 0)
>+
>+#define XSPI_DLCR 0x130U
>+
>+#define XSPI_DLCR_DL_NONDLP_FLSH_MASK BIT(24)
>+#define XSPI_DLCR_DL_NONDLP_FLSH_SHIFT 24
>+#define XSPI_DLCR_DLP_SEL_FA_MASK GENMASK(15, 14)
>+#define XSPI_DLCR_DLP_SEL_FA_SHIFT 14
>+#define XSPI_DLCR_DLP_SEL_FA(x) ((x) << 14)
>+
>+#define XSPI_TBSR 0x150U
>+
>+#define XSPI_TBSR_TRCTR_MASK GENMASK(31, 16)
>+#define XSPI_TBSR_TRCTR_SHIFT 16
>+#define XSPI_TBSR_TRCTR(x) ((x) << 16)
>+#define XSPI_TBSR_TRBFL_MASK GENMASK(8, 0)
>+#define XSPI_TBSR_TRBFL_SHIFT 0
>+#define XSPI_TBSR_TRBFL(x) ((x) << 0)
>+
>+#define XSPI_TBDR 0x154U
>+
>+#define XSPI_TBDR_TXDATA_MASK GENMASK(31, 0)
>+#define XSPI_TBDR_TXDATA_SHIFT 0
>+#define XSPI_TBDR_TXDATA(x) ((x) << 0)
>+
>+#define XSPI_TBCT 0x158U
>+
>+#define XSPI_TBCT_WMRK_MASK GENMASK(7, 0)
>+#define XSPI_TBCT_WMRK_SHIFT 0
>+#define XSPI_TBCT_WMRK(x) ((x) << 0)
>+
>+#define XSPI_SR 0x15CU
>+
>+#define XSPI_SR_TXFULL_MASK BIT(27)
>+#define XSPI_SR_TXFULL_SHIFT 27
>+#define XSPI_SR_TXDMA_MASK BIT(26)
>+#define XSPI_SR_TXDMA_SHIFT 26
>+#define XSPI_SR_TXWA_MASK BIT(25)
>+#define XSPI_SR_TXWA_SHIFT 25
>+#define XSPI_SR_TXNE_MASK BIT(24)
>+#define XSPI_SR_TXNE_SHIFT 24
>+#define XSPI_SR_RXDMA_MASK BIT(23)
>+#define XSPI_SR_RXDMA_SHIFT 23
>+#define XSPI_SR_ARB_STATE_MASK GENMASK(22, 20)
>+#define XSPI_SR_ARB_STATE_SHIFT 20
>+#define XSPI_SR_ARB_STATE(x) ((x) << 20)
>+#define XSPI_SR_RXFULL_MASK BIT(19)
>+#define XSPI_SR_RXFULL_SHIFT 19
>+#define XSPI_SR_RXWE_MASK BIT(16)
>+#define XSPI_SR_RXWE_SHIFT 16
>+#define XSPI_SR_ARB_LCK_MASK BIT(15)
>+#define XSPI_SR_ARB_LCK_SHIFT 15
>+#define XSPI_SR_AHBnFUL_MASK GENMASK(14, 11)
>+#define XSPI_SR_AHBnFUL_SHIFT 11
>+#define XSPI_SR_AHBnFUL(x) ((x) << 11)
>+#define XSPI_SR_AHBnNE_MASK GENMASK(10, 7)
>+#define XSPI_SR_AHBnNE_SHIFT 7
>+#define XSPI_SR_AHBnNE(x) ((x) << 7)
>+#define XSPI_SR_AHBTRN_MASK BIT(6)
>+#define XSPI_SR_AHBTRN_SHIFT 6
>+#define XSPI_SR_AWRACC_MASK BIT(4)
>+#define XSPI_SR_AWRACC_SHIFT 4
>+#define XSPI_SR_AHB_ACC_MASK BIT(2)
>+#define XSPI_SR_AHB_ACC_SHIFT 2
>+#define XSPI_SR_IP_ACC_MASK BIT(1)
>+#define XSPI_SR_IP_ACC_SHIFT 1
>+#define XSPI_SR_BUSY_MASK BIT(0)
>+#define XSPI_SR_BUSY_SHIFT 0
>+
>+#define XSPI_FR 0x160U
>+
>+#define XSPI_FR_DLPFF_MASK BIT(31)
>+#define XSPI_FR_DLPFF_SHIFT 31
>+#define XSPI_FR_DLLABRT_MASK BIT(28)
>+#define XSPI_FR_DLLABRT_SHIFT 28
>+#define XSPI_FR_TBFF_MASK BIT(27)
>+#define XSPI_FR_TBFF_SHIFT 27
>+#define XSPI_FR_TBUF_MASK BIT(26)
>+#define XSPI_FR_TBUF_SHIFT 26
>+#define XSPI_FR_DLLUNLCK_MASK BIT(24)
>+#define XSPI_FR_DLLUNLCK_SHIFT 24
>+#define XSPI_FR_ILLINE_MASK BIT(23)
>+#define XSPI_FR_ILLINE_SHIFT 23
>+#define XSPI_FR_RBOF_MASK BIT(17)
>+#define XSPI_FR_RBOF_SHIFT 17
>+#define XSPI_FR_RBDF_MASK BIT(16)
>+#define XSPI_FR_RBDF_SHIFT 16
>+#define XSPI_FR_AAEF_MASK BIT(15)
>+#define XSPI_FR_AAEF_SHIFT 15
>+#define XSPI_FR_AITEF_MASK BIT(14)
>+#define XSPI_FR_AITEF_SHIFT 14
>+#define XSPI_FR_AIBSEF_MASK BIT(13)
>+#define XSPI_FR_AIBSEF_SHIFT 13
>+#define XSPI_FR_ABOF_MASK BIT(12)
>+#define XSPI_FR_ABOF_SHIFT 12
>+#define XSPI_FR_CRCAEF_MASK BIT(10)
>+#define XSPI_FR_CRCAEF_SHIFT 10
>+#define XSPI_FR_PPWF_MASK BIT(8)
>+#define XSPI_FR_PPWF_SHIFT 8
>+#define XSPI_FR_IPIEF_MASK BIT(6)
>+#define XSPI_FR_IPIEF_SHIFT 6
>+#define XSPI_FR_IPEDERR_MASK BIT(5)
>+#define XSPI_FR_IPEDERR_SHIFT 5
>+#define XSPI_FR_PERFOVF_MASK BIT(2)
>+#define XSPI_FR_PERFOVF_SHIFT 2
>+#define XSPI_FR_RDADDR_MASK BIT(1)
>+#define XSPI_FR_RDADDR_SHIFT 1
>+#define XSPI_FR_TFF_MASK BIT(0)
>+#define XSPI_FR_TFF_SHIFT 0
>+
>+#define XSPI_SFA1AD 0x180U
>+
>+#define XSPI_SFA1AD_TPAD_MASK GENMASK(31, 10)
>+#define XSPI_SFA1AD_TPAD_SHIFT 10
>+#define XSPI_SFA1AD_TPAD(x) ((x) << 10)
>+
>+#define XSPI_SFA2AD 0x184U
>+
>+#define XSPI_DLPR 0x190U
>+
>+#define XSPI_DLPR_DLPV_MASK GENMASK(31, 0)
>+#define XSPI_DLPR_DLPV_SHIFT 0
>+#define XSPI_DLPR_DLPV(x) ((x) << 0)
>+
>+#define XSPI_RBDR 0x200U
>+
>+#define XSPI_LUTKEY 0x300U
>+
>+#define XSPI_LCKCR 0x304U
>+
>+#define XSPI_LCKCR_UNLOCK_MASK BIT(1)
>+#define XSPI_LCKCR_UNLOCK_SHIFT 1
>+#define XSPI_LCKCR_LOCK_MASK BIT(0)
>+#define XSPI_LCKCR_LOCK_SHIFT 0
>+
>+#define XSPI_LUT			0x310
>+
>+#define XSPI_BFGENCR 0x20
>+
>+#define XSPI_BFGENCR_SEQID_WR_MASK GENMASK(31, 28)
>+#define XSPI_BFGENCR_SEQID_WR_SHIFT 28
>+#define XSPI_BFGENCR_SEQID_WR(x) ((x) << 28)
>+#define XSPI_BFGENCR_ALIGN_MASK GENMASK(23, 22)
>+#define XSPI_BFGENCR_ALIGN_SHIFT 22
>+#define XSPI_BFGENCR_ALIGN(x) ((x) << 22)
>+#define XSPI_BFGENCR_WR_FLUSH_EN_MASK BIT(21)
>+#define XSPI_BFGENCR_WR_FLUSH_EN_SHIFT 21
>+#define XSPI_BFGENCR_PPWF_CLR_MASK BIT(20)
>+#define XSPI_BFGENCR_PPWF_CLR_SHIFT 20
>+#define XSPI_BFGENCR_SEQID_WR_EN_MASK BIT(17)
>+#define XSPI_BFGENCR_SEQID_WR_EN_SHIFT 17
>+#define XSPI_BFGENCR_SEQID_MASK GENMASK(15, 12)
>+#define XSPI_BFGENCR_SEQID_SHIFT 12
>+#define XSPI_BFGENCR_SEQID(x) ((x) << 12)
>+#define XSPI_BFGENCR_AHBSSIZE_MASK GENMASK(10, 9)
>+#define XSPI_BFGENCR_AHBSSIZE_SHIFT 9
>+#define XSPI_BFGENCR_AHBSSIZE(x) ((x) << 9)
>+#define XSPI_BFGENCR_SPLITEN_MASK BIT(8)
>+#define XSPI_BFGENCR_SPLITEN_SHIFT 8
>+#define XSPI_BFGENCR_SEQID_RDSR_MASK GENMASK(3, 0)
>+#define XSPI_BFGENCR_SEQID_RDSR_SHIFT 0
>+#define XSPI_BFGENCR_SEQID_RDSR(x) ((x) << 0)
>+
>+#define XSPI_FRAD0_WORD2 0x808U
>+
>+#define XSPI_FRAD0_WORD2_EALO_MASK GENMASK(29, 24)
>+#define XSPI_FRAD0_WORD2_EALO_SHIFT 24
>+#define XSPI_FRAD0_WORD2_EALO(x) ((x) << 24)
>+#define XSPI_FRAD0_WORD2_MD4ACP_MASK GENMASK(14, 12)
>+#define XSPI_FRAD0_WORD2_MD4ACP_SHIFT 12
>+#define XSPI_FRAD0_WORD2_MD4ACP(x) ((x) << 12)
>+#define XSPI_FRAD0_WORD2_MD3ACP_MASK GENMASK(11, 9)
>+#define XSPI_FRAD0_WORD2_MD3ACP_SHIFT 9
>+#define XSPI_FRAD0_WORD2_MD3ACP(x) ((x) << 9)
>+#define XSPI_FRAD0_WORD2_MD2ACP_MASK GENMASK(8, 6)
>+#define XSPI_FRAD0_WORD2_MD2ACP_SHIFT 6
>+#define XSPI_FRAD0_WORD2_MD2ACP(x) ((x) << 6)
>+#define XSPI_FRAD0_WORD2_MD1ACP_MASK GENMASK(5, 3)
>+#define XSPI_FRAD0_WORD2_MD1ACP_SHIFT 3
>+#define XSPI_FRAD0_WORD2_MD1ACP(x) ((x) << 3)
>+#define XSPI_FRAD0_WORD2_MD0ACP_MASK GENMASK(2, 0)
>+#define XSPI_FRAD0_WORD2_MD0ACP_SHIFT 0
>+#define XSPI_FRAD0_WORD2_MD0ACP(x) ((x) << 0)
>+
>+#define XSPI_FRAD1_WORD2 0x828U
>+
>+#define XSPI_FRAD2_WORD2 0x848U
>+
>+#define XSPI_FRAD3_WORD2 0x868U
>+
>+#define XSPI_FRAD4_WORD2 0x888U
>+
>+#define XSPI_FRAD5_WORD2 0x8A8U
>+
>+#define XSPI_FRAD6_WORD2 0x8C8U
>+
>+#define XSPI_FRAD7_WORD2 0x8E8U
>+
>+#define XSPI_FRAD8_WORD2 0x988U
>+
>+#define XSPI_FRAD9_WORD2 0x9A8U
>+
>+#define XSPI_FRAD10_WORD2 0x9C8U
>+
>+#define XSPI_FRAD11_WORD2 0x9E8U
>+
>+#define XSPI_FRAD12_WORD2 0xA08U
>+
>+#define XSPI_FRAD13_WORD2 0xA28U
>+
>+#define XSPI_FRAD14_WORD2 0xA48U
>+
>+#define XSPI_FRAD15_WORD2 0xA68U
>+
>+#define XSPI_FRAD0_WORD3 0x80CU
>+
>+#define XSPI_FRAD0_WORD3_VLD_MASK BIT(31)
>+#define XSPI_FRAD0_WORD3_VLD_SHIFT 31
>+#define XSPI_FRAD0_WORD3_LOCK_MASK GENMASK(30, 29)
>+#define XSPI_FRAD0_WORD3_LOCK_SHIFT 29
>+#define XSPI_FRAD0_WORD3_LOCK(x) ((x) << 29)
>+#define XSPI_FRAD0_WORD3_EAL_MASK GENMASK(25, 24)
>+#define XSPI_FRAD0_WORD3_EAL_SHIFT 24
>+#define XSPI_FRAD0_WORD3_EAL(x) ((x) << 24)
>+
>+#define XSPI_FRAD1_WORD3 0x82CU
>+
>+#define XSPI_FRAD2_WORD3 0x84CU
>+
>+#define XSPI_FRAD3_WORD3 0x86CU
>+
>+#define XSPI_FRAD4_WORD3 0x88CU
>+
>+#define XSPI_FRAD5_WORD3 0x8ACU
>+
>+#define XSPI_FRAD6_WORD3 0x8CCU
>+
>+#define XSPI_FRAD7_WORD3 0x8ECU
>+
>+#define XSPI_FRAD8_WORD3 0x98CU
>+
>+#define XSPI_FRAD9_WORD3 0x9ACU
>+
>+#define XSPI_FRAD10_WORD3 0x9CCU
>+
>+#define XSPI_FRAD11_WORD3 0x9ECU
>+
>+#define XSPI_FRAD12_WORD3 0xA0CU
>+
>+#define XSPI_FRAD13_WORD3 0xA2CU
>+
>+#define XSPI_FRAD14_WORD3 0xA4CU
>+
>+#define XSPI_FRAD15_WORD3 0xA6CU
>+
>+#define XSPI_TG0MDAD 0x900U
>+
>+#define XSPI_TG0MDAD_VLD_MASK BIT(31)
>+#define XSPI_TG0MDAD_VLD_SHIFT 31
>+#define XSPI_TG0MDAD_LCK_MASK BIT(29)
>+#define XSPI_TG0MDAD_LCK_SHIFT 29
>+#define XSPI_TG0MDAD_SA_MASK GENMASK(15, 14)
>+#define XSPI_TG0MDAD_SA_SHIFT 14
>+#define XSPI_TG0MDAD_SA(x) ((x) << 14)
>+#define XSPI_TG0MDAD_MASKTYPE_MASK BIT(12)
>+#define XSPI_TG0MDAD_MASKTYPE_SHIFT 12
>+#define XSPI_TG0MDAD_MASK_MASK GENMASK(11, 6)
>+#define XSPI_TG0MDAD_MASK_SHIFT 6
>+#define XSPI_TG0MDAD_MASK(x) ((x) << 6)
>+#define XSPI_TG0MDAD_MIDMATCH_MASK GENMASK(5, 0)
>+#define XSPI_TG0MDAD_MIDMATCH_SHIFT 0
>+#define XSPI_TG0MDAD_MIDMATCH(x) ((x) << 0)
>+
>+#define XSPI_TG1MDAD 0x910U
>+
>+#define XSPI_MGC 0x920
>+
>+#define XSPI_MGC_GVLD_MASK BIT(31)
>+#define XSPI_MGC_GVLD_SHIFT 31
>+#define XSPI_MGC_GVLDMDAD_MASK BIT(29)
>+#define XSPI_MGC_GVLDMDAD_SHIFT 29
>+#define XSPI_MGC_GVLDFRAD_MASK BIT(27)
>+#define XSPI_MGC_GVLDFRAD_SHIFT 27
>+#define XSPI_MGC_TG1_FIX_PRIO_MASK BIT(16)
>+#define XSPI_MGC_TG1_FIX_PRIO_SHIFT 16
>+#define XSPI_MGC_GCLCK_MASK GENMASK(11, 10)
>+#define XSPI_MGC_GCLCK_SHIFT 10
>+#define XSPI_MGC_GCLCK(x) ((x) << 10)
>+#define XSPI_MGC_GCLCKMID_MASK GENMASK(5, 0)
>+#define XSPI_MGC_GCLCKMID_SHIFT 0
>+#define XSPI_MGC_GCLCKMID(x) ((x) << 0)
>+
>+#define XSPI_MTO 0x928
>+
>+#define XSPI_MTO_SFP_ACC_TO_MASK GENMASK(31, 0)
>+#define XSPI_MTO_SFP_ACC_TO_SHIFT 0
>+#define XSPI_MTO_SFP_ACC_TO(x) ((x) << 0)
>+
>+#define XSPI_TG2MDAD_EXT 0x940U
>+
>+#define XSPI_TG2MDAD_EXT_VLD_MASK BIT(31)
>+#define XSPI_TG2MDAD_EXT_VLD_SHIFT 31
>+#define XSPI_TG2MDAD_EXT_LCK_MASK BIT(29)
>+#define XSPI_TG2MDAD_EXT_LCK_SHIFT 29
>+#define XSPI_TG2MDAD_EXT_SA_MASK GENMASK(15, 14)
>+#define XSPI_TG2MDAD_EXT_SA_SHIFT 14
>+#define XSPI_TG2MDAD_EXT_SA(x) ((x) << 14)
>+#define XSPI_TG2MDAD_EXT_MASKTYPE_MASK BIT(12)
>+#define XSPI_TG2MDAD_EXT_MASKTYPE_SHIFT 12
>+#define XSPI_TG2MDAD_EXT_MASK_MASK GENMASK(11, 6)
>+#define XSPI_TG2MDAD_EXT_MASK_SHIFT 6
>+#define XSPI_TG2MDAD_EXT_MASK(x) ((x) << 6)
>+#define XSPI_TG2MDAD_EXT_MIDMATCH_MASK GENMASK(5, 0)
>+#define XSPI_TG2MDAD_EXT_MIDMATCH_SHIFT 0
>+#define XSPI_TG2MDAD_EXT_MIDMATCH(x) ((x) << 0)
>+
>+#define XSPI_TG3MDAD_EXT 0x944U
>+
>+#define XSPI_TG4MDAD_EXT 0x948U
>+
>+#define XSPI_SFP_TG_IPCR 0x958U
>+
>+#define XSPI_SFP_TG_IPCR_SEQID_MASK GENMASK(27, 24)
>+#define XSPI_SFP_TG_IPCR_SEQID_SHIFT 24
>+#define XSPI_SFP_TG_IPCR_SEQID(x) ((x) << 24)
>+#define XSPI_SFP_TG_IPCR_ARB_UNLOCK_MASK BIT(23)
>+#define XSPI_SFP_TG_IPCR_ARB_UNLOCK_SHIFT 23
>+#define XSPI_SFP_TG_IPCR_ARB_LOCK_MASK BIT(22)
>+#define XSPI_SFP_TG_IPCR_ARB_LOCK_SHIFT 22
>+#define XSPI_SFP_TG_IPCR_IDATSZ_MASK GENMASK(15, 0)
>+#define XSPI_SFP_TG_IPCR_IDATSZ_SHIFT 0
>+#define XSPI_SFP_TG_IPCR_IDATSZ(x) ((x) << 0)
>+
>+#define XSPI_SFP_TG_SFAR 0x95CU
>+
>+/* XSPI Register defination end */
>+
>+/* xspi data structure */
>+struct nxp_xspi_devtype_data {
>+	unsigned int rxfifo;
>+	unsigned int rx_buf_size;
>+	unsigned int txfifo;
>+	unsigned int ahb_buf_size;
>+	unsigned int quirks;
>+};
>+
>+struct nxp_xspi {
>+	struct udevice *dev;
>+	u32 iobase;
>+	u32 ahb_addr;
>+	u32 a1_size;
>+	u32 a2_size;
>+	struct {
>+		bool gmid:1;
>+		u32 env:3;
>+	} config;

Why use bitfield here?

>+	struct clk clk;
>+	struct nxp_xspi_devtype_data *devtype_data;
>+	unsigned long support_max_rate;
>+	int selected;
>+	bool dtr;
>+};
>+
>+/* xspi data structure end */
>+
>+/********* XSPI CMD definitions ***************************/
>+#define CMD_SDR 0x01U
>+#define CMD_DDR 0x11U
>+#define RADDR_SDR 0x02U
>+#define RADDR_DDR 0x0AU
>+#define CADDR_SDR 0x12U
>+#define CADDR_DDR 0x13U
>+#define MODE2_SDR 0x05U
>+#define MODE2_DDR 0x0CU
>+#define MODE4_SDR 0x06U
>+#define MODE4_DDR 0x0DU
>+#define MODE8_SDR 0x04U
>+#define MODE8_DDR 0x0BU
>+#define WRITE_SDR 0x08U
>+#define WRITE_DDR 0x0FU
>+#define READ_SDR 0x07U
>+#define READ_DDR 0x0EU
>+#define DATA_LEARN 0x10U
>+#define DUMMY_CYCLE 0x03U
>+#define JMP_ON_CS 0x09U
>+#define JMP_TO_SEQ 0x14U
>+#define CMD_STOP 0U
>+
>+/********* XSPI PAD definitions ************/
>+#define XSPI_1PAD 0U
>+#define XSPI_2PAD 1U
>+#define XSPI_4PAD 2U
>+#define XSPI_8PAD 3U
>+
>+#define DEFAULT_XMIT_SIZE 0x40U
>+
>+#define ENV_ADDR_SIZE 0x10000

SZ_64KB

>+
>+#define XSPI_LUT_KEY_VAL		(0x5AF05AF0UL)

Drop ().

>+
Regards
Peng

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH v3 2/4] misc: ele_api: Add support for XSPI SET GMID command
  2026-03-03  1:10 ` [PATCH v3 2/4] misc: ele_api: Add support for XSPI SET GMID command alice.guo
@ 2026-03-03  3:29   ` Peng Fan
  0 siblings, 0 replies; 8+ messages in thread
From: Peng Fan @ 2026-03-03  3:29 UTC (permalink / raw)
  To: alice.guo
  Cc: NXP i.MX U-Boot Team, u-boot, Tom Rini, Stefano Babic,
	Fabio Estevam, Greg Malysa, Arturs Artamonovs, Vasileios Bimpikas,
	Utsav Agarwal, Nathan Barrett-Morrison, Kuan-Wei Chiu,
	Jerome Forissier, Peng Fan, Raymond Mao, Neil Armstrong,
	Stefan Roese, Mattijs Korpershoek, Piotr Wojtaszczyk,
	Ralph Siemsen, Boon Khai Ng, Patrice Chotard, Christian Marangi,
	Ian Roberts, Ye Li, Jacky Bai, Marek Vasut, Sam Protsenko,
	Alice Guo

On Tue, Mar 03, 2026 at 09:10:27AM +0800, alice.guo@oss.nxp.com wrote:
>From: Ye Li <ye.li@nxp.com>
>
>The XSPI SET GMID command is used to assign GMID ownership to the
>requester, allowing access to protected XSPI control registers. This API
>must be called in SPL if XSPI GMID-protected settings need to be
>modified. Otherwise, XSPI configuration depends on the previous GMID
>owner to provide the correct settings.
>
>Signed-off-by: Ye Li <ye.li@nxp.com>
>Signed-off-by: Alice Guo <alice.guo@nxp.com>
>---
> arch/arm/include/asm/mach-imx/ele_api.h |  2 ++
> drivers/misc/imx_ele/ele_api.c          | 28 ++++++++++++++++++++++++++++
> 2 files changed, 30 insertions(+)
>
>diff --git a/arch/arm/include/asm/mach-imx/ele_api.h b/arch/arm/include/asm/mach-imx/ele_api.h
>index 4e1afc42bd8..04e7f20a2a6 100644
>--- a/arch/arm/include/asm/mach-imx/ele_api.h
>+++ b/arch/arm/include/asm/mach-imx/ele_api.h
>@@ -49,6 +49,7 @@
> #define ELE_ATTEST_REQ (0xDB)
> #define ELE_RELEASE_PATCH_REQ (0xDC)
> #define ELE_OTP_SEQ_SWITH_REQ (0xDD)
>+#define ELE_SET_GMID_REQ (0xE4)
> #define ELE_WRITE_SHADOW_REQ (0xF2)
> #define ELE_READ_SHADOW_REQ (0xF3)

We should drop (), but to keep code consistent, it is fine here.

> 
>@@ -162,6 +163,7 @@ int ele_return_lifecycle_update(ulong signed_msg_blk, u32 *response);
> int ele_start_rng(void);
[...]
>+		printf("Error: %s: ret %d, response 0x%x\n",
>+		       __func__, ret, msg.data[0]);
>+
>+	if (response)
>+		*response = msg.data[0];
>+
>+	return ret;
>+}


Reviewed-by: Peng Fan <peng.fan@nxp.com>

>
>-- 
>2.43.0
>

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH v3 3/4] imx94_evk: Get ownership of XSPI control registers protected by GMID in SPL
  2026-03-03  1:10 ` [PATCH v3 3/4] imx94_evk: Get ownership of XSPI control registers protected by GMID in SPL alice.guo
@ 2026-03-03  3:30   ` Peng Fan
  0 siblings, 0 replies; 8+ messages in thread
From: Peng Fan @ 2026-03-03  3:30 UTC (permalink / raw)
  To: alice.guo
  Cc: NXP i.MX U-Boot Team, u-boot, Tom Rini, Stefano Babic,
	Fabio Estevam, Greg Malysa, Arturs Artamonovs, Vasileios Bimpikas,
	Utsav Agarwal, Nathan Barrett-Morrison, Kuan-Wei Chiu,
	Jerome Forissier, Peng Fan, Raymond Mao, Neil Armstrong,
	Stefan Roese, Mattijs Korpershoek, Piotr Wojtaszczyk,
	Ralph Siemsen, Boon Khai Ng, Patrice Chotard, Christian Marangi,
	Ian Roberts, Ye Li, Jacky Bai, Marek Vasut, Sam Protsenko,
	Alice Guo

On Tue, Mar 03, 2026 at 09:10:28AM +0800, alice.guo@oss.nxp.com wrote:
>From: Ye Li <ye.li@nxp.com>
>
>To gain access to certain registers that are protected by GMID, the SPL
>must release XSPI ownership to the current core.
>
>Signed-off-by: Ye Li <ye.li@nxp.com>
>Signed-off-by: Alice Guo <alice.guo@nxp.com>

Reviewed-by: Peng Fan <peng.fan@nxp.com>

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2026-03-03  3:28 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-03-03  1:10 [PATCH v3 0/4] Enable XSPI1 on i.MX943 EVK board alice.guo
2026-03-03  1:10 ` [PATCH v3 1/4] spi: nxp_xspi: Add new driver for NXP XSPI controller alice.guo
2026-03-03  3:27   ` Peng Fan
2026-03-03  1:10 ` [PATCH v3 2/4] misc: ele_api: Add support for XSPI SET GMID command alice.guo
2026-03-03  3:29   ` Peng Fan
2026-03-03  1:10 ` [PATCH v3 3/4] imx94_evk: Get ownership of XSPI control registers protected by GMID in SPL alice.guo
2026-03-03  3:30   ` Peng Fan
2026-03-03  1:10 ` [PATCH v3 4/4] imx943_evk: Enable XSPI1 alice.guo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox