Skip to contentSkip to conversation

spi: cadence_spi: Adopt Linux DT bindings

PATCH Superseded Jason Rush 2 participants 8 messages Jan 23, 2018 – Jan 26, 2018

Subsystems (2)
lore
Share & tools
lore

Jason Rush

author
#0 lore raw

v6 cover spi: cadence_spi: Adopt Linux DT bindings

Adopt the Linux DT bindings. This also fixes an issue with the indaddrtrig register on the Cadence QSPI device being programmed with the wrong value for the socfpga arch.

Tested on TI K2G platform:

Tested on a socfpga-cyclonev board:

Jason Rush (4):
spi: cadence_spi: Sync DT bindings with Linux
dts: cadence_spi: Sync DT bindings with Linux
config: cadence_spi: Remove defines read from DT
dts: cadence_spi: Update documentation for DT bindings

 arch/arm/dts/keystone-k2g-evm.dts             | 75 +++++++++++++--------------
 arch/arm/dts/keystone-k2g.dtsi                |  5 +-
 arch/arm/dts/socfpga.dtsi                     |  5 +-
 arch/arm/dts/socfpga_arria10.dtsi             |  4 +-
 arch/arm/dts/socfpga_arria5_socdk.dts         |  9 ++--
 arch/arm/dts/socfpga_cyclone5_is1.dts         |  9 ++--
 arch/arm/dts/socfpga_cyclone5_socdk.dts       |  9 ++--
 arch/arm/dts/socfpga_cyclone5_sockit.dts      |  9 ++--
 arch/arm/dts/socfpga_cyclone5_socrates.dts    |  9 ++--
 arch/arm/dts/socfpga_cyclone5_sr1500.dts      |  9 ++--
 arch/arm/dts/socfpga_cyclone5_vining_fpga.dts | 18 +++----
 arch/arm/dts/stv0991.dts                      | 12 +++--
 doc/device-tree-bindings/spi/spi-cadence.txt  | 13 +++--
 drivers/spi/cadence_qspi.c                    | 20 ++++---
 drivers/spi/cadence_qspi.h                    |  6 ++-
 drivers/spi/cadence_qspi_apb.c                | 15 ++----
 include/configs/k2g_evm.h                     |  1 -
 include/configs/socfpga_common.h              |  1 -
 include/configs/stv0991.h                     |  1 -
 19 files changed, 113 insertions(+), 117 deletions(-)
Signature · 1 line
2.11.0
author
#1 lore raw

PATCH v6 1/4 spi: cadence_spi: Sync DT bindings with Linux

Adopt the Linux DT bindings. This also fixes an issue with the indaddrtrig register on the Cadence QSPI device being programmed with the wrong value for the socfpga arch.

Tested on TI K2G platform:

Tested on a socfpga-cyclonev board:

---
Changes for v6:
- Fixed single line comment and indentation
Changes for v5:
- Rebased
Changes for v4:
- Rebased
Changes for v3:
- None

 drivers/spi/cadence_qspi.c     | 20 ++++++++++++--------
 drivers/spi/cadence_qspi.h     |  6 +++++-
 drivers/spi/cadence_qspi_apb.c | 15 ++++-----------
 3 files changed, 21 insertions(+), 20 deletions(-)
drivers/spi/cadence_qspi.c +12 -8
index 9a6e41f330..7b312f8e3e 100644
@@ -212,7 +212,7 @@ static int cadence_spi_xfer(struct udevice *dev, unsigned int bitlen,
 
 	/* Set Chip select */
 	cadence_qspi_apb_chipselect(base, spi_chip_select(dev),
-				    CONFIG_CQSPI_DECODER);
+				    plat->is_decoded_cs);
 
 	if ((flags & SPI_XFER_END) || (flags == 0)) {
 		if (priv->cmd_len == 0) {
@@ -296,7 +296,11 @@ static int cadence_spi_ofdata_to_platdata(struct udevice *bus)
 
 	plat->regbase = (void *)data[0];
 	plat->ahbbase = (void *)data[2];
-	plat->sram_size = fdtdec_get_int(blob, node, "sram-size", 128);
+	plat->is_decoded_cs = fdtdec_get_bool(blob, node, "cdns,is-decoded-cs");
+	plat->fifo_depth = fdtdec_get_uint(blob, node, "cdns,fifo-depth", 128);
+	plat->fifo_width = fdtdec_get_uint(blob, node, "cdns,fifo-width", 4);
+	plat->trigger_address = fdtdec_get_uint(blob, node,
+						"cdns,trigger-address", 0);
 
 	/* All other paramters are embedded in the child node */
 	subnode = fdt_first_subnode(blob, node);
@@ -310,12 +314,12 @@ static int cadence_spi_ofdata_to_platdata(struct udevice *bus)
 				       500000);
 
 	/* Read other parameters from DT */
-	plat->page_size = fdtdec_get_int(blob, subnode, "page-size", 256);
-	plat->block_size = fdtdec_get_int(blob, subnode, "block-size", 16);
-	plat->tshsl_ns = fdtdec_get_int(blob, subnode, "tshsl-ns", 200);
-	plat->tsd2d_ns = fdtdec_get_int(blob, subnode, "tsd2d-ns", 255);
-	plat->tchsh_ns = fdtdec_get_int(blob, subnode, "tchsh-ns", 20);
-	plat->tslch_ns = fdtdec_get_int(blob, subnode, "tslch-ns", 20);
+	plat->page_size = fdtdec_get_uint(blob, subnode, "page-size", 256);
+	plat->block_size = fdtdec_get_uint(blob, subnode, "block-size", 16);
+	plat->tshsl_ns = fdtdec_get_uint(blob, subnode, "cdns,tshsl-ns", 200);
+	plat->tsd2d_ns = fdtdec_get_uint(blob, subnode, "cdns,tsd2d-ns", 255);
+	plat->tchsh_ns = fdtdec_get_uint(blob, subnode, "cdns,tchsh-ns", 20);
+	plat->tslch_ns = fdtdec_get_uint(blob, subnode, "cdns,tslch-ns", 20);
 
 	debug("%s: regbase=%p ahbbase=%p max-frequency=%d page-size=%d\n",
 	      __func__, plat->regbase, plat->ahbbase, plat->max_hz,
drivers/spi/cadence_qspi.h +5 -1
index d1927a4003..9106b09d29 100644
@@ -18,14 +18,18 @@ struct cadence_spi_platdata {
 	unsigned int	max_hz;
 	void		*regbase;
 	void		*ahbbase;
+	bool		is_decoded_cs;
+	u32		fifo_depth;
+	u32		fifo_width;
+	u32		trigger_address;
 
+	/* Flash parameters */
 	u32		page_size;
 	u32		block_size;
 	u32		tshsl_ns;
 	u32		tsd2d_ns;
 	u32		tchsh_ns;
 	u32		tslch_ns;
-	u32		sram_size;
 };
 
 struct cadence_spi_priv {
drivers/spi/cadence_qspi_apb.c +4 -11
index e02f2217f4..e29c988312 100644
@@ -37,10 +37,6 @@
 #define CQSPI_REG_RETRY				10000
 #define CQSPI_POLL_IDLE_RETRY			3
 
-#define CQSPI_FIFO_WIDTH			4
-
-#define CQSPI_REG_SRAM_THRESHOLD_WORDS		50
-
 /* Transfer mode */
 #define CQSPI_INST_TYPE_SINGLE			0
 #define CQSPI_INST_TYPE_DUAL			1
@@ -51,9 +47,6 @@
 #define CQSPI_DUMMY_CLKS_PER_BYTE		8
 #define CQSPI_DUMMY_BYTES_MAX			4
 
-#define CQSPI_REG_SRAM_FILL_THRESHOLD	\
-	((CQSPI_REG_SRAM_SIZE_WORD / 2) * CQSPI_FIFO_WIDTH)
-
 /****************************************************************************
  * Controller's configuration and status register (offset from QSPI_BASE)
  ****************************************************************************/
@@ -400,7 +393,7 @@ void cadence_qspi_apb_controller_init(struct cadence_spi_platdata *plat)
 	writel(0, plat->regbase + CQSPI_REG_REMAP);
 
 	/* Indirect mode configurations */
-	writel((plat->sram_size/2), plat->regbase + CQSPI_REG_SRAMPARTITION);
+	writel(plat->fifo_depth / 2, plat->regbase + CQSPI_REG_SRAMPARTITION);
 
 	/* Disable all interrupts */
 	writel(0, plat->regbase + CQSPI_REG_IRQMASK);
@@ -560,7 +553,7 @@ int cadence_qspi_apb_indirect_read_setup(struct cadence_spi_platdata *plat,
 		addr_bytes = cmdlen - 1;
 
 	/* Setup the indirect trigger address */
-	writel((u32)plat->ahbbase,
+	writel(plat->trigger_address,
 	       plat->regbase + CQSPI_REG_INDIRECTTRIGGER);
 
 	/* Configure the opcode */
@@ -659,7 +652,7 @@ int cadence_qspi_apb_indirect_read_execute(struct cadence_spi_platdata *plat,
 		bytes_to_read = ret;
 
 		while (bytes_to_read != 0) {
-			bytes_to_read *= CQSPI_FIFO_WIDTH;
+			bytes_to_read *= plat->fifo_width;
 			bytes_to_read = bytes_to_read > remaining ?
 					remaining : bytes_to_read;
 			readsl(plat->ahbbase, bb_rxbuf, bytes_to_read >> 2);
@@ -710,7 +703,7 @@ int cadence_qspi_apb_indirect_write_setup(struct cadence_spi_platdata *plat,
 		return -EINVAL;
 	}
 	/* Setup the indirect trigger address */
-	writel((u32)plat->ahbbase,
+	writel(plat->trigger_address,
 	       plat->regbase + CQSPI_REG_INDIRECTTRIGGER);
 
 	/* Configure the opcode */
Signature · 1 line
2.11.0
author
#2 lore raw

PATCH v6 2/4 dts: cadence_spi: Sync DT bindings with Linux

In reply to Jason Rush

Adopt the Linux DT bindings and clean-up duplicate and unused values.

Fix indentation of the QSPI node in the keystone k2g device tree.

Tested on TI K2G platform:

Tested on a socfpga-cyclonev board:

---
Changes for v6:
- Squashed fix for indentation in k2g dts
Changes for v5:
- Rebased
Changes for v4:
- Rebased
Changes for v3:
- Update the DT bindings in keystone-k2g-evm.dts

 arch/arm/dts/keystone-k2g-evm.dts             | 75 +++++++++++++--------------
 arch/arm/dts/keystone-k2g.dtsi                |  5 +-
 arch/arm/dts/socfpga.dtsi                     |  5 +-
 arch/arm/dts/socfpga_arria10.dtsi             |  4 +-
 arch/arm/dts/socfpga_arria5_socdk.dts         |  9 ++--
 arch/arm/dts/socfpga_cyclone5_is1.dts         |  9 ++--
 arch/arm/dts/socfpga_cyclone5_socdk.dts       |  9 ++--
 arch/arm/dts/socfpga_cyclone5_sockit.dts      |  9 ++--
 arch/arm/dts/socfpga_cyclone5_socrates.dts    |  9 ++--
 arch/arm/dts/socfpga_cyclone5_sr1500.dts      |  9 ++--
 arch/arm/dts/socfpga_cyclone5_vining_fpga.dts | 18 +++----
 arch/arm/dts/stv0991.dts                      | 12 +++--
 12 files changed, 84 insertions(+), 89 deletions(-)
arch/arm/dts/keystone-k2g-evm.dts +37 -38
index de208b3613..ad746c7311 100644
@@ -68,46 +68,45 @@
 &qspi {
 	status = "okay";
 
-        flash0: m25p80 at 0 {
-                compatible = "s25fl512s","spi-flash";
-                reg = <0>;
-                spi-tx-bus-width = <1>;
-                spi-rx-bus-width = <4>;
-                spi-max-frequency = <96000000>;
-                #address-cells = <1>;
-                #size-cells = <1>;
-                tshsl-ns = <392>;
-                tsd2d-ns = <392>;
-                tchsh-ns = <100>;
-                tslch-ns = <100>;
+	flash0: m25p80 at 0 {
+		compatible = "s25fl512s","spi-flash";
+		reg = <0>;
+		spi-tx-bus-width = <1>;
+		spi-rx-bus-width = <4>;
+		spi-max-frequency = <96000000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+		cdns,tshsl-ns = <392>;
+		cdns,tsd2d-ns = <392>;
+		cdns,tchsh-ns = <100>;
+		cdns,tslch-ns = <100>;
 		block-size = <18>;
 
-
-                partition at 0 {
-                        label = "QSPI.u-boot-spl-os";
-                        reg = <0x00000000 0x00100000>;
-                };
-                partition at 1 {
-                        label = "QSPI.u-boot-env";
-                        reg = <0x00100000 0x00040000>;
-                };
-                partition at 2 {
-                        label = "QSPI.skern";
-                        reg = <0x00140000 0x0040000>;
-                };
-                partition at 3 {
-                        label = "QSPI.pmmc-firmware";
-                        reg = <0x00180000 0x0040000>;
-                };
-                partition at 4 {
-                        label = "QSPI.kernel";
-                        reg = <0x001C0000 0x0800000>;
-                };
-                partition at 5 {
-                        label = "QSPI.file-system";
-                        reg = <0x009C0000 0x3640000>;
-                };
-        };
+		partition at 0 {
+			label = "QSPI.u-boot-spl-os";
+			reg = <0x00000000 0x00100000>;
+		};
+		partition at 1 {
+			label = "QSPI.u-boot-env";
+			reg = <0x00100000 0x00040000>;
+		};
+		partition at 2 {
+			label = "QSPI.skern";
+			reg = <0x00140000 0x0040000>;
+		};
+		partition at 3 {
+			label = "QSPI.pmmc-firmware";
+			reg = <0x00180000 0x0040000>;
+		};
+		partition at 4 {
+			label = "QSPI.kernel";
+			reg = <0x001C0000 0x0800000>;
+		};
+		partition at 5 {
+			label = "QSPI.file-system";
+			reg = <0x009C0000 0x3640000>;
+		};
+	};
 };
 
 &mmc0 {
arch/arm/dts/keystone-k2g.dtsi +3 -2
index 7b2fae6860..9bcfea6d86 100644
@@ -92,8 +92,9 @@
 			      <0x24000000 0x4000000>;
 			interrupts = <GIC_SPI 198 IRQ_TYPE_EDGE_RISING>;
 			num-cs = <4>;
-			fifo-depth = <256>;
-			sram-size = <256>;
+			cdns,fifo-depth = <256>;
+			cdns,fifo-width = <4>;
+			cdns,trigger-address = <0x24000000>;
 			status = "disabled";
 		};
 
arch/arm/dts/socfpga.dtsi +3 -2
index 8588221e57..7557aa01e5 100644
@@ -644,8 +644,9 @@
 			clocks = <&qspi_clk>;
 			ext-decoder = <0>;  /* external decoder */
 			num-cs = <4>;
-			fifo-depth = <128>;
-			sram-size = <128>;
+			cdns,fifo-depth = <128>;
+			cdns,fifo-width = <4>;
+			cdns,trigger-address = <0x00000000>;
 			bus-num = <2>;
 			status = "disabled";
 		};
arch/arm/dts/socfpga_arria10.dtsi +2 -2
index 377700df11..abfd0bc4f8 100644
@@ -734,8 +734,8 @@
 			clocks = <&l4_main_clk>;
 			ext-decoder = <0>;  /* external decoder */
 			num-chipselect = <4>;
-			fifo-depth = <128>;
-			sram-size = <512>;
+			cdns,fifo-depth = <128>;
+			cdns,fifo-width = <4>;
 			bus-num = <2>;
 			status = "disabled";
 		};
arch/arm/dts/socfpga_arria5_socdk.dts +4 -5
index 726505821f..1e91a65af6 100644
@@ -94,10 +94,9 @@
 		m25p,fast-read;
 		page-size = <256>;
 		block-size = <16>; /* 2^16, 64KB */
-		read-delay = <4>;  /* delay value in read data capture register */
-		tshsl-ns = <50>;
-		tsd2d-ns = <50>;
-		tchsh-ns = <4>;
-		tslch-ns = <4>;
+		cdns,tshsl-ns = <50>;
+		cdns,tsd2d-ns = <50>;
+		cdns,tchsh-ns = <4>;
+		cdns,tslch-ns = <4>;
 	};
 };
arch/arm/dts/socfpga_cyclone5_is1.dts +4 -5
index 16a3283710..2e2b71fefb 100644
@@ -93,11 +93,10 @@
 		m25p,fast-read;
 		page-size = <256>;
 		block-size = <16>; /* 2^16, 64KB */
-		read-delay = <4>;  /* delay value in read data capture register */
-		tshsl-ns = <50>;
-		tsd2d-ns = <50>;
-		tchsh-ns = <4>;
-		tslch-ns = <4>;
+		cdns,tshsl-ns = <50>;
+		cdns,tsd2d-ns = <50>;
+		cdns,tchsh-ns = <4>;
+		cdns,tslch-ns = <4>;
 	};
 };
 
arch/arm/dts/socfpga_cyclone5_socdk.dts +4 -5
index f175ef2ead..95a8e653d7 100644
@@ -104,11 +104,10 @@
 		m25p,fast-read;
 		page-size = <256>;
 		block-size = <16>; /* 2^16, 64KB */
-		read-delay = <4>;  /* delay value in read data capture register */
-		tshsl-ns = <50>;
-		tsd2d-ns = <50>;
-		tchsh-ns = <4>;
-		tslch-ns = <4>;
+		cdns,tshsl-ns = <50>;
+		cdns,tsd2d-ns = <50>;
+		cdns,tchsh-ns = <4>;
+		cdns,tslch-ns = <4>;
 	};
 };
 
arch/arm/dts/socfpga_cyclone5_sockit.dts +4 -5
index e45c2abbc2..6f42b88130 100644
@@ -84,11 +84,10 @@
 		m25p,fast-read;
 		page-size = <256>;
 		block-size = <16>; /* 2^16, 64KB */
-		read-delay = <4>;  /* delay value in read data capture register */
-		tshsl-ns = <50>;
-		tsd2d-ns = <50>;
-		tchsh-ns = <4>;
-		tslch-ns = <4>;
+		cdns,tshsl-ns = <50>;
+		cdns,tsd2d-ns = <50>;
+		cdns,tchsh-ns = <4>;
+		cdns,tslch-ns = <4>;
 	};
 };
 
arch/arm/dts/socfpga_cyclone5_socrates.dts +4 -5
index bdd93248fb..e3ae8a8207 100644
@@ -74,11 +74,10 @@
 		m25p,fast-read;
 		page-size = <256>;
 		block-size = <16>; /* 2^16, 64KB */
-		read-delay = <4>;  /* delay value in read data capture register */
-		tshsl-ns = <50>;
-		tsd2d-ns = <50>;
-		tchsh-ns = <4>;
-		tslch-ns = <4>;
+		cdns,tshsl-ns = <50>;
+		cdns,tsd2d-ns = <50>;
+		cdns,tchsh-ns = <4>;
+		cdns,tslch-ns = <4>;
 	};
 };
 
arch/arm/dts/socfpga_cyclone5_sr1500.dts +4 -5
index 739bbb7f3d..e24830af57 100644
@@ -92,10 +92,9 @@
 		m25p,fast-read;
 		page-size = <256>;
 		block-size = <16>; /* 2^16, 64KB */
-		read-delay = <4>;  /* delay value in read data capture register */
-		tshsl-ns = <50>;
-		tsd2d-ns = <50>;
-		tchsh-ns = <4>;
-		tslch-ns = <4>;
+		cdns,tshsl-ns = <50>;
+		cdns,tsd2d-ns = <50>;
+		cdns,tchsh-ns = <4>;
+		cdns,tslch-ns = <4>;
 	};
 };
arch/arm/dts/socfpga_cyclone5_vining_fpga.dts +8 -10
index f168e4ff99..a0febe91b0 100644
@@ -79,11 +79,10 @@
 		m25p,fast-read;
 		page-size = <256>;
 		block-size = <16>; /* 2^16, 64KB */
-		read-delay = <4>;  /* delay value in read data capture register */
-		tshsl-ns = <50>;
-		tsd2d-ns = <50>;
-		tchsh-ns = <4>;
-		tslch-ns = <4>;
+		cdns,tshsl-ns = <50>;
+		cdns,tsd2d-ns = <50>;
+		cdns,tchsh-ns = <4>;
+		cdns,tslch-ns = <4>;
 	};
 
 	flash1: n25q00 at 1 {
@@ -96,11 +95,10 @@
 		m25p,fast-read;
 		page-size = <256>;
 		block-size = <16>; /* 2^16, 64KB */
-		read-delay = <4>;  /* delay value in read data capture register */
-		tshsl-ns = <50>;
-		tsd2d-ns = <50>;
-		tchsh-ns = <4>;
-		tslch-ns = <4>;
+		cdns,tshsl-ns = <50>;
+		cdns,tsd2d-ns = <50>;
+		cdns,tchsh-ns = <4>;
+		cdns,tslch-ns = <4>;
 	};
 };
 
arch/arm/dts/stv0991.dts +7 -5
index fa3fd641b2..bceac09154 100644
@@ -32,7 +32,9 @@
 			reg = <0x80203000 0x100>,
 				<0x40000000 0x1000000>;
 			clocks = <3750000>;
-			sram-size = <256>;
+			cdns,fifo-depth = <256>;
+			cdns,fifo-width = <4>;
+			cdns,trigger-address = <0x40000000>;
 			status = "okay";
 
 			flash0: n25q32 at 0 {
@@ -44,10 +46,10 @@
 				m25p,fast-read;
 				page-size = <256>;
 				block-size = <16>; 	/* 2^16, 64KB */
-				tshsl-ns = <50>;
-				tsd2d-ns = <50>;
-				tchsh-ns = <4>;
-				tslch-ns = <4>;
+				cdns,tshsl-ns = <50>;
+				cdns,tsd2d-ns = <50>;
+				cdns,tchsh-ns = <4>;
+				cdns,tslch-ns = <4>;
 			};
 	};
 };
Signature · 1 line
2.11.0
author
#3 lore raw

PATCH v6 3/4 config: cadence_spi: Remove defines read from DT

In reply to Jason Rush

Cleanup unused #define values that are read from the DT.

Tested on TI K2G platform:

Tested on a socfpga-cyclonev board:

---
Changes for v6:
- None
Changes for v5:
- Rebased
Changes for v4:
- Rebased
Changes for v3:
- None

 include/configs/k2g_evm.h        | 1 -
 include/configs/socfpga_common.h | 1 -
 include/configs/stv0991.h        | 1 -
 3 files changed, 3 deletions(-)
include/configs/k2g_evm.h +0 -1
index 4e43104fac..852c30cf8f 100644
@@ -95,7 +95,6 @@
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_CADENCE_QSPI
 #define CONFIG_CQSPI_REF_CLK 384000000
-#define CONFIG_CQSPI_DECODER 0x0
 #define CONFIG_BOUNCE_BUFFER
 #endif
 
include/configs/socfpga_common.h +0 -1
index 66e7c4fc8b..ec8bb50050 100644
@@ -184,7 +184,6 @@ unsigned int cm_get_l4_sp_clk_hz(void);
 unsigned int cm_get_qspi_controller_clk_hz(void);
 #define CONFIG_CQSPI_REF_CLK		cm_get_qspi_controller_clk_hz()
 #endif
-#define CONFIG_CQSPI_DECODER		0
 #define CONFIG_BOUNCE_BUFFER
 
 /*
include/configs/stv0991.h +0 -1
index c99fb676cb..fd96979bf8 100644
@@ -63,7 +63,6 @@
 + * QSPI support
 + */
 #ifdef CONFIG_OF_CONTROL		/* QSPI is controlled via DT */
-#define CONFIG_CQSPI_DECODER		0
 #define CONFIG_CQSPI_REF_CLK		((30/4)/2)*1000*1000
 #define CONFIG_BOUNCE_BUFFER
 
Signature · 1 line
2.11.0
author
#4 lore raw

PATCH v6 4/4 dts: cadence_spi: Update documentation for DT bindings

In reply to Jason Rush

Update documentation to reflect adopting the Linux DT bindings.

Tested on TI K2G platform:

Tested on a socfpga-cyclonev board:

---
Changes for v6:
- None
Changes for v5:
- Rebased
Changes for v4:
- Updated documentation

 doc/device-tree-bindings/spi/spi-cadence.txt | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
doc/device-tree-bindings/spi/spi-cadence.txt +8 -5
index c1e2233d7c..74c82080fc 100644
@@ -6,7 +6,10 @@ Required properties:
 - reg			: 1.Physical base address and size of SPI registers map.
 			  2. Physical base address & size of NOR Flash.
 - clocks		: Clock phandles (see clock bindings for details).
-- sram-size		: spi controller sram size.
+- cdns,fifo-depth	: Size of the data FIFO in words.
+- cdns,fifo-width	: Bus width of the data FIFO in bytes.
+- cdns,trigger-address	: 32-bit indirect AHB trigger address.
+- cdns,is-decoded-cs	: Flag to indicate whether decoder is used or not.
 - status		: enable in requried dts.
 
 connected flash properties
@@ -15,14 +18,14 @@ connected flash properties
 - spi-max-frequency	: Max supported spi frequency.
 - page-size		: Flash page size.
 - block-size		: Flash memory block size.
-- tshsl-ns		: Added delay in master reference clocks (ref_clk) for
+- cdns,tshsl-ns		: Added delay in master reference clocks (ref_clk) for
 			  the length that the master mode chip select outputs
 			  are de-asserted between transactions.
-- tsd2d-ns		: Delay in master reference clocks (ref_clk) between one
+- cdns,tsd2d-ns		: Delay in master reference clocks (ref_clk) between one
 			  chip select being de-activated and the activation of
 			  another.
-- tchsh-ns		: Delay in master reference clocks between last bit of
+- cdns,tchsh-ns		: Delay in master reference clocks between last bit of
 			  current transaction and de-asserting the device chip
 			  select (n_ss_out).
-- tslch-ns		: Delay in master reference clocks between setting
+- cdns,tslch-ns		: Delay in master reference clocks between setting
 			  n_ss_out low and first bit transfer
Signature · 1 line
2.11.0
author
#5 lore raw

v6 cover spi: cadence_spi: Adopt Linux DT bindings

In reply to Jason Rush
Quoted 34 lines · Jason Rush

Adopt the Linux DT bindings. This also fixes an issue with the indaddrtrig register on the Cadence QSPI device being programmed with the wrong value for the socfpga arch.

Tested on TI K2G platform:

Tested on a socfpga-cyclonev board:

Jason Rush (4):
spi: cadence_spi: Sync DT bindings with Linux
dts: cadence_spi: Sync DT bindings with Linux
config: cadence_spi: Remove defines read from DT
dts: cadence_spi: Update documentation for DT bindings

 arch/arm/dts/keystone-k2g-evm.dts             | 75 +++++++++++++--------------
 arch/arm/dts/keystone-k2g.dtsi                |  5 +-
 arch/arm/dts/socfpga.dtsi                     |  5 +-
 arch/arm/dts/socfpga_arria10.dtsi             |  4 +-
 arch/arm/dts/socfpga_arria5_socdk.dts         |  9 ++--
 arch/arm/dts/socfpga_cyclone5_is1.dts         |  9 ++--
 arch/arm/dts/socfpga_cyclone5_socdk.dts       |  9 ++--
 arch/arm/dts/socfpga_cyclone5_sockit.dts      |  9 ++--
 arch/arm/dts/socfpga_cyclone5_socrates.dts    |  9 ++--
 arch/arm/dts/socfpga_cyclone5_sr1500.dts      |  9 ++--
 arch/arm/dts/socfpga_cyclone5_vining_fpga.dts | 18 +++----
 arch/arm/dts/stv0991.dts                      | 12 +++--
Quoted 9 lines
 doc/device-tree-bindings/spi/spi-cadence.txt  | 13 +++--
 drivers/spi/cadence_qspi.c                    | 20 ++++---
 drivers/spi/cadence_qspi.h                    |  6 ++-
 drivers/spi/cadence_qspi_apb.c                | 15 ++----
 include/configs/k2g_evm.h                     |  1 -
 include/configs/socfpga_common.h              |  1 -
 include/configs/stv0991.h                     |  1 -
 19 files changed, 113 insertions(+), 117 deletions(-)

This patch set includes a couple cosmetic changes Jagan asked for. Can this still make it into the 2018.3 merge window?

-- Jason

#6 lore raw

v6 cover spi: cadence_spi: Adopt Linux DT bindings

Quoted 44 lines · Jason Rush
Quoted 34 lines · Jason Rush

Adopt the Linux DT bindings. This also fixes an issue with the indaddrtrig register on the Cadence QSPI device being programmed with the wrong value for the socfpga arch.

Tested on TI K2G platform:

Tested on a socfpga-cyclonev board:

Jason Rush (4):
spi: cadence_spi: Sync DT bindings with Linux
dts: cadence_spi: Sync DT bindings with Linux
config: cadence_spi: Remove defines read from DT
dts: cadence_spi: Update documentation for DT bindings

 arch/arm/dts/keystone-k2g-evm.dts             | 75 +++++++++++++--------------
 arch/arm/dts/keystone-k2g.dtsi                |  5 +-
 arch/arm/dts/socfpga.dtsi                     |  5 +-
 arch/arm/dts/socfpga_arria10.dtsi             |  4 +-
 arch/arm/dts/socfpga_arria5_socdk.dts         |  9 ++--
 arch/arm/dts/socfpga_cyclone5_is1.dts         |  9 ++--
 arch/arm/dts/socfpga_cyclone5_socdk.dts       |  9 ++--
 arch/arm/dts/socfpga_cyclone5_sockit.dts      |  9 ++--
 arch/arm/dts/socfpga_cyclone5_socrates.dts    |  9 ++--
 arch/arm/dts/socfpga_cyclone5_sr1500.dts      |  9 ++--
 arch/arm/dts/socfpga_cyclone5_vining_fpga.dts | 18 +++----
 arch/arm/dts/stv0991.dts                      | 12 +++--
Quoted 9 lines
 doc/device-tree-bindings/spi/spi-cadence.txt  | 13 +++--
 drivers/spi/cadence_qspi.c                    | 20 ++++---
 drivers/spi/cadence_qspi.h                    |  6 ++-
 drivers/spi/cadence_qspi_apb.c                | 15 ++----
 include/configs/k2g_evm.h                     |  1 -
 include/configs/socfpga_common.h              |  1 -
 include/configs/stv0991.h                     |  1 -
 19 files changed, 113 insertions(+), 117 deletions(-)
Quoted 2 lines

This patch set includes a couple cosmetic changes Jagan asked for. Can this still make it into the 2018.3 merge window?

yes, these are in travis build, will send PR once all done.

#7 lore raw

v6 cover spi: cadence_spi: Adopt Linux DT bindings

In reply to Jason Rush
Quoted 16 lines · Jason Rush

Adopt the Linux DT bindings. This also fixes an issue with the indaddrtrig register on the Cadence QSPI device being programmed with the wrong value for the socfpga arch.

Tested on TI K2G platform:

Tested on a socfpga-cyclonev board:

Quoted 5 lines

Jason Rush (4):
spi: cadence_spi: Sync DT bindings with Linux
dts: cadence_spi: Sync DT bindings with Linux
config: cadence_spi: Remove defines read from DT
dts: cadence_spi: Update documentation for DT bindings

Applied to u-boot-spi/master, thanks!