Skip to contentSkip to conversation

arm: dts: k3-j721e: Enable OSPI1/QSPI

PATCH Superseded Keerthy 2 participants 5 messages Mar 3, 2020 Arm (32-bit)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Keerthy

author
#0 lore raw

cover arm: dts: k3-j721e: Enable OSPI1/QSPI

The patch series enables he OSPI1 aka QSPI node. This is a precursor for enabling QSPI boot on j721e.

Keerthy (3):
arm: dts: k3-j721e-common-proc-board-u-boot: Enable ospi1/qspi
arm: dts: k3-j721e-mcu-wakeup: Add assigned-clocks/rates properties
for ospi1/qspi
arm: dts: k3-j721e-r5-common-proc-board: Add ospi1 flash node

 .../k3-j721e-common-proc-board-u-boot.dtsi    | 23 +++++++++++++++++
 arch/arm/dts/k3-j721e-common-proc-board.dts   | 13 ----------
 arch/arm/dts/k3-j721e-mcu-wakeup.dtsi         |  2 ++
 .../arm/dts/k3-j721e-r5-common-proc-board.dts | 25 +++++++++++++++++++
 4 files changed, 50 insertions(+), 13 deletions(-)
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 1/3 arm: dts: k3-j721e-common-proc-board-u-boot: Enable ospi1/qspi

Enable the ospi1/qspi module while at it move the corresponding pins to common u-boot.dtsi file.

---
 .../k3-j721e-common-proc-board-u-boot.dtsi    | 23 +++++++++++++++++++
 arch/arm/dts/k3-j721e-common-proc-board.dts   | 13 -----------
 2 files changed, 23 insertions(+), 13 deletions(-)
arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi +23 -0
index d422100d42..d15b5181f4 100644
@@ -260,6 +260,20 @@
 			J721E_WKUP_IOPAD(0x0088, PIN_INPUT, 0) /* (L4) MCU_MDIO0_MDIO */
 		>;
 	};
+
+	mcu_fss0_ospi1_pins_default: mcu-fss0-ospi1-pins-default {
+		pinctrl-single,pins = <
+			J721E_WKUP_IOPAD(0x34, PIN_OUTPUT, 0) /* (F22) MCU_OSPI1_CLK */
+			J721E_WKUP_IOPAD(0x50, PIN_OUTPUT, 0) /* (C22) MCU_OSPI1_CSn0 */
+			J721E_WKUP_IOPAD(0x40, PIN_INPUT, 0) /* (D22) MCU_OSPI1_D0 */
+			J721E_WKUP_IOPAD(0x44, PIN_INPUT, 0) /* (G22) MCU_OSPI1_D1 */
+			J721E_WKUP_IOPAD(0x48, PIN_INPUT, 0) /* (D23) MCU_OSPI1_D2 */
+			J721E_WKUP_IOPAD(0x4c, PIN_INPUT, 0) /* (C23) MCU_OSPI1_D3 */
+			J721E_WKUP_IOPAD(0x3c, PIN_INPUT, 0) /* (B23) MCU_OSPI1_DQS */
+			J721E_WKUP_IOPAD(0x38, PIN_INPUT, 0) /* (A23) MCU_OSPI1_LBCLKO */
+		>;
+		u-boot,dm-spl;
+	};
 };
 
 &main_pmx0 {
@@ -365,3 +379,12 @@
 		u-boot,dm-spl;
 	};
 };
+
+&ospi1 {
+	status = "okay";
+	u-boot,dm-spl;
+
+	flash at 0 {
+		u-boot,dm-spl;
+	};
+};
arch/arm/dts/k3-j721e-common-proc-board.dts +0 -13
index 496a15e1d1..d02422ed25 100644
@@ -123,19 +123,6 @@
 			J721E_WKUP_IOPAD(0xfc, PIN_INPUT_PULLUP, 0) /* (H24) WKUP_I2C0_SDA */
 		>;
 	};
-
-	mcu_fss0_ospi1_pins_default: mcu-fss0-ospi1-pins-default {
-		pinctrl-single,pins = <
-			J721E_WKUP_IOPAD(0x34, PIN_OUTPUT, 0) /* (F22) MCU_OSPI1_CLK */
-			J721E_WKUP_IOPAD(0x50, PIN_OUTPUT, 0) /* (C22) MCU_OSPI1_CSn0 */
-			J721E_WKUP_IOPAD(0x40, PIN_INPUT, 0) /* (D22) MCU_OSPI1_D0 */
-			J721E_WKUP_IOPAD(0x44, PIN_INPUT, 0) /* (G22) MCU_OSPI1_D1 */
-			J721E_WKUP_IOPAD(0x48, PIN_INPUT, 0) /* (D23) MCU_OSPI1_D2 */
-			J721E_WKUP_IOPAD(0x4c, PIN_INPUT, 0) /* (C23) MCU_OSPI1_D3 */
-			J721E_WKUP_IOPAD(0x3c, PIN_INPUT, 0) /* (B23) MCU_OSPI1_DQS */
-			J721E_WKUP_IOPAD(0x38, PIN_INPUT, 0) /* (A23) MCU_OSPI1_LBCLKO */
-		>;
-	};
 };
 
 &usbss0 {
Signature · 1 line
2.17.1
#2 lore raw

PATCH 1/3 arm: dts: k3-j721e-common-proc-board-u-boot: Enable ospi1/qspi

Hi,

Quoted 20 lines · Keerthy

Enable the ospi1/qspi module while at it move the corresponding pins to common u-boot.dtsi file.

---
 .../k3-j721e-common-proc-board-u-boot.dtsi    | 23 +++++++++++++++++++
 arch/arm/dts/k3-j721e-common-proc-board.dts   | 13 -----------
 2 files changed, 23 insertions(+), 13 deletions(-)
arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi +3 -0
index d422100d42..d15b5181f4 100644
@@ -260,6 +260,20 @@
 			J721E_WKUP_IOPAD(0x0088, PIN_INPUT, 0) /* (L4) MCU_MDIO0_MDIO */
 		>;
 	};
+
+	mcu_fss0_ospi1_pins_default: mcu-fss0-ospi1-pins-default {
+		pinctrl-single,pins = <

arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi line 275

Quoted 10 lines
arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi +10 -0
+			J721E_WKUP_IOPAD(0x34, PIN_OUTPUT, 0) /* (F22) MCU_OSPI1_CLK */
+			J721E_WKUP_IOPAD(0x50, PIN_OUTPUT, 0) /* (C22) MCU_OSPI1_CSn0 */
+			J721E_WKUP_IOPAD(0x40, PIN_INPUT, 0) /* (D22) MCU_OSPI1_D0 */
+			J721E_WKUP_IOPAD(0x44, PIN_INPUT, 0) /* (G22) MCU_OSPI1_D1 */
+			J721E_WKUP_IOPAD(0x48, PIN_INPUT, 0) /* (D23) MCU_OSPI1_D2 */
+			J721E_WKUP_IOPAD(0x4c, PIN_INPUT, 0) /* (C23) MCU_OSPI1_D3 */
+			J721E_WKUP_IOPAD(0x3c, PIN_INPUT, 0) /* (B23) MCU_OSPI1_DQS */
+			J721E_WKUP_IOPAD(0x38, PIN_INPUT, 0) /* (A23) MCU_OSPI1_LBCLKO */
+		>;
+		u-boot,dm-spl;

pinmux should be in k3-j721e-common-proc-board.dts like in kernel DT. Replicate the pinmux in R5 dts file for use in R5 SPL. Only u-boot specific property "u-boot,dm-spl" should be added in k3-j721e-common-proc-board-u-boot.dtsi

arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi line 384

Quoted 11 lines
arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi +4 -0
+	};
 };
 
 &main_pmx0 {
@@ -365,3 +379,12 @@
 		u-boot,dm-spl;
 	};
 };
+
+&ospi1 {
+	status = "okay";

No need to for status = "okay" as OSPI1 is enabled by default.

Quoted 31 lines
arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi +6 -0
+	u-boot,dm-spl;
+
+	flash at 0 {
+		u-boot,dm-spl;
+	};
+};
arch/arm/dts/k3-j721e-common-proc-board.dts +0 -13
index 496a15e1d1..d02422ed25 100644
@@ -123,19 +123,6 @@
 			J721E_WKUP_IOPAD(0xfc, PIN_INPUT_PULLUP, 0) /* (H24) WKUP_I2C0_SDA */
 		>;
 	};
-
-	mcu_fss0_ospi1_pins_default: mcu-fss0-ospi1-pins-default {
-		pinctrl-single,pins = <
-			J721E_WKUP_IOPAD(0x34, PIN_OUTPUT, 0) /* (F22) MCU_OSPI1_CLK */
-			J721E_WKUP_IOPAD(0x50, PIN_OUTPUT, 0) /* (C22) MCU_OSPI1_CSn0 */
-			J721E_WKUP_IOPAD(0x40, PIN_INPUT, 0) /* (D22) MCU_OSPI1_D0 */
-			J721E_WKUP_IOPAD(0x44, PIN_INPUT, 0) /* (G22) MCU_OSPI1_D1 */
-			J721E_WKUP_IOPAD(0x48, PIN_INPUT, 0) /* (D23) MCU_OSPI1_D2 */
-			J721E_WKUP_IOPAD(0x4c, PIN_INPUT, 0) /* (C23) MCU_OSPI1_D3 */
-			J721E_WKUP_IOPAD(0x3c, PIN_INPUT, 0) /* (B23) MCU_OSPI1_DQS */
-			J721E_WKUP_IOPAD(0x38, PIN_INPUT, 0) /* (A23) MCU_OSPI1_LBCLKO */
-		>;
-	};
 };
 
 &usbss0 {
author
#3 lore raw

PATCH 2/3 arm: dts: k3-j721e-mcu-wakeup: Add assigned-clocks/rates properties for ospi1/qspi

In reply to Keerthy

Add assigned-clocks/rates properties for ospi1/qspi. This is the expected rate as per ROM configuration.

---
 arch/arm/dts/k3-j721e-mcu-wakeup.dtsi | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/dts/k3-j721e-mcu-wakeup.dtsi +2 -0
index a9e97f219b..2eed50aa5a 100644
@@ -170,6 +170,8 @@
 			cdns,fifo-width = <4>;
 			cdns,trigger-address = <0x0>;
 			clocks = <&k3_clks 104 0>;
+			assigned-clocks = <&k3_clks 104 0>;
+			assigned-clock-rates = <133333333>;
 			power-domains = <&k3_pds 104 TI_SCI_PD_EXCLUSIVE>;
 			#address-cells = <1>;
 			#size-cells = <0>;
Signature · 1 line
2.17.1
author
#4 lore raw

PATCH 3/3 arm: dts: k3-j721e-r5-common-proc-board: Add ospi1 flash node

In reply to Keerthy

Add ospi1 flash node required for QSPI boot.

---
 .../arm/dts/k3-j721e-r5-common-proc-board.dts | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
arch/arm/dts/k3-j721e-r5-common-proc-board.dts +25 -0
index ebea9efa58..cb98e4ba33 100644
@@ -306,4 +306,29 @@
 	};
 };
 
+&ospi1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&mcu_fss0_ospi1_pins_default>;
+	u-boot,dm-spl;
+
+	reg = <0x0 0x47050000 0x0 0x100>,
+	      <0x0 0x58000000 0x0 0x8000000>;
+
+	flash at 0{
+		compatible = "jedec,spi-nor";
+		reg = <0x0>;
+		spi-tx-bus-width = <1>;
+		spi-rx-bus-width = <4>;
+		spi-max-frequency = <40000000>;
+		cdns,tshsl-ns = <60>;
+		cdns,tsd2d-ns = <60>;
+		cdns,tchsh-ns = <60>;
+		cdns,tslch-ns = <60>;
+		cdns,read-delay = <2>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+		u-boot,dm-spl;
+	};
+};
+
 #include "k3-j721e-common-proc-board-u-boot.dtsi"
Signature · 1 line
2.17.1