From d3e27f518f402e123e5b9fcd8bb106a617f52c10 Mon Sep 17 00:00:00 2001
From: Kumar Gala <kumar.gala@linaro.org>
Date: Fri, 7 Dec 2018 14:08:29 -0600
Subject: [PATCH] boards: arm: nxp: imxrt: Fix SPI nodes on flexspi controller

Fix the QSPI and hyperflash nodes to be proper SPI children and expose
the address range for direct access as part of the controller's reg
region.

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
---
 boards/arm/mimxrt1020_evk/mimxrt1020_evk.dts            | 9 +++++----
 boards/arm/mimxrt1050_evk/mimxrt1050_evk.dts            | 5 +++--
 boards/arm/mimxrt1050_evk/mimxrt1050_evk_qspi.dts       | 9 +++++----
 boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts            | 9 +++++----
 boards/arm/mimxrt1060_evk/mimxrt1060_evk_hyperflash.dts | 9 +++++----
 dts/arm/nxp/nxp_rt.dtsi                                 | 2 +-
 6 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/boards/arm/mimxrt1020_evk/mimxrt1020_evk.dts b/boards/arm/mimxrt1020_evk/mimxrt1020_evk.dts
index 5f783ca1c4d..ec526bff111 100644
--- a/boards/arm/mimxrt1020_evk/mimxrt1020_evk.dts
+++ b/boards/arm/mimxrt1020_evk/mimxrt1020_evk.dts
@@ -27,7 +27,7 @@
 #if defined(CONFIG_CODE_ITCM)
 		zephyr,flash = &itcm0;
 #elif defined(CONFIG_CODE_QSPI)
-		zephyr,flash = &qspi0;
+		zephyr,flash = &is25wp064;
 #endif
 		zephyr,sram = &dtcm0;
 		zephyr,console = &uart1;
@@ -58,9 +58,10 @@
 };
 
 &flexspi0 {
-	qspi0: qspi@60000000 {
-		/* ISSI IS25LP064A-JBLE */
-		reg = <0x60000000 0x800000>;
+	reg = <0x402a8000 0x4000>, <0x60000000 0x800000>;
+	is25wp064: is25wp064@0 {
+		compatible = "issi,is25wp064", "jedec,spi-nor";
+		reg = <0>;
 		status = "ok";
 	};
 };
diff --git a/boards/arm/mimxrt1050_evk/mimxrt1050_evk.dts b/boards/arm/mimxrt1050_evk/mimxrt1050_evk.dts
index 5f8931b669c..ac43e6412c3 100644
--- a/boards/arm/mimxrt1050_evk/mimxrt1050_evk.dts
+++ b/boards/arm/mimxrt1050_evk/mimxrt1050_evk.dts
@@ -63,9 +63,10 @@
 arduino_serial: &uart3 {};
 
 &flexspi0 {
+	reg = <0x402a8000 0x4000>, <0x60000000 0x4000000>;
 	hyperflash0: hyperflash@0 {
-		/* Cypress S26KS512SDPBHI02 */
-		reg = <0x60000000 0x4000000>;
+		compatible = "cypress,s26ks512s";
+		reg = <0>;
 		status = "ok";
 	};
 };
diff --git a/boards/arm/mimxrt1050_evk/mimxrt1050_evk_qspi.dts b/boards/arm/mimxrt1050_evk/mimxrt1050_evk_qspi.dts
index a875f045669..c3272de62d2 100644
--- a/boards/arm/mimxrt1050_evk/mimxrt1050_evk_qspi.dts
+++ b/boards/arm/mimxrt1050_evk/mimxrt1050_evk_qspi.dts
@@ -11,7 +11,7 @@
 #if defined(CONFIG_CODE_ITCM)
 		zephyr,flash = &itcm0;
 #elif defined(CONFIG_CODE_QSPI)
-		zephyr,flash = &qspi0;
+		zephyr,flash = &is25wp064;
 #endif
 	};
 };
@@ -19,9 +19,10 @@
 /delete-node/ &hyperflash0;
 
 &flexspi0 {
-	qspi0: qspi@0 {
-		/* ISSI IS25WP064AJBLE */
-		reg = <0x60000000 0x800000>;
+	reg = <0x402a8000 0x4000>, <0x60000000 0x800000>;
+	is25wp064: is25wp064@0 {
+		compatible = "issi,is25wp064", "jedec,spi-nor";
+		reg = <0>;
 		status = "ok";
 	};
 };
diff --git a/boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts b/boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts
index 0bf73801e40..5e86f36edbb 100644
--- a/boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts
+++ b/boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts
@@ -27,7 +27,7 @@
 #if defined(CONFIG_CODE_ITCM)
 		zephyr,flash = &itcm0;
 #elif defined(CONFIG_CODE_QSPI)
-		zephyr,flash = &qspi0;
+		zephyr,flash = &is25wp064;
 #endif
 		zephyr,sram = &dtcm0;
 		zephyr,console = &uart1;
@@ -58,9 +58,10 @@
 };
 
 &flexspi0 {
-	qspi0: qspi@60000000 {
-		/* ISSI IS25WP064AJBLE */
-		reg = <0x60000000 0x800000>;
+	reg = <0x402a8000 0x4000>, <0x60000000 0x800000>;
+	is25wp064: is25wp064@0 {
+		compatible = "issi,is25wp064", "jedec,spi-nor";
+		reg = <0>;
 		status = "ok";
 	};
 };
diff --git a/boards/arm/mimxrt1060_evk/mimxrt1060_evk_hyperflash.dts b/boards/arm/mimxrt1060_evk/mimxrt1060_evk_hyperflash.dts
index 079f1a669b8..c06a5d60db5 100644
--- a/boards/arm/mimxrt1060_evk/mimxrt1060_evk_hyperflash.dts
+++ b/boards/arm/mimxrt1060_evk/mimxrt1060_evk_hyperflash.dts
@@ -16,11 +16,12 @@
 	};
 };
 
-/delete-node/ &qspi0;
+/delete-node/ &is25wp064;
 &flexspi0 {
-	hyperflash0: hyperflash@60000000 {
-		/* Cypress S26KS512SDPBHI02 */
-		reg = <0x60000000 0x4000000>;
+	reg = <0x402a8000 0x4000>, <0x60000000 0x4000000>;
+	hyperflash0: hyperflash@0 {
+		compatible = "cypress,s26ks512s";
+		reg = <0>;
 		status = "ok";
 	};
 };
diff --git a/dts/arm/nxp/nxp_rt.dtsi b/dts/arm/nxp/nxp_rt.dtsi
index b386d32a29c..01c60ffd617 100644
--- a/dts/arm/nxp/nxp_rt.dtsi
+++ b/dts/arm/nxp/nxp_rt.dtsi
@@ -51,7 +51,7 @@
 			interrupts = <108 0>;
 			label = "FLEXSPI0";
 			#address-cells = <1>;
-			#size-cells = <1>;
+			#size-cells = <0>;
 		};
 
 		semc0: semc0@402f0000 {