[PATCH] ARM: dts: gemini: rename to nand-controller

[PATCH] ARM: dts: gemini: rename to nand-controller

[Corentin Labbe]

We must use nand-controller instead of flash.

Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
---
 arch/arm/boot/dts/gemini-dlink-dir-685.dts | 2 +-
 arch/arm/boot/dts/gemini-nas4220b.dts      | 2 +-
 arch/arm/boot/dts/gemini-rut1xx.dts        | 3 +--
 arch/arm/boot/dts/gemini-sl93512r.dts      | 2 +-
 arch/arm/boot/dts/gemini-sq201.dts         | 2 +-
 arch/arm/boot/dts/gemini-wbd111.dts        | 2 +-
 arch/arm/boot/dts/gemini-wbd222.dts        | 2 +-
 arch/arm/boot/dts/gemini.dtsi              | 2 +-
 8 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/arch/arm/boot/dts/gemini-dlink-dir-685.dts b/arch/arm/boot/dts/gemini-dlink-dir-685.dts
index cc39289e99dd..5e205bb53e5a 100644
--- a/arch/arm/boot/dts/gemini-dlink-dir-685.dts
+++ b/arch/arm/boot/dts/gemini-dlink-dir-685.dts
@@ -281,7 +281,7 @@ phy4: phy@4 {
 	};
 
 	soc {
-		flash@30000000 {
+		nand-controller@30000000 {
 			/*
 			 * Flash access collides with the Chip Enable signal for
 			 * the display panel, that reuse the parallel flash Chip
diff --git a/arch/arm/boot/dts/gemini-nas4220b.dts b/arch/arm/boot/dts/gemini-nas4220b.dts
index 43c45f7e1e0a..1e2d3162d9c1 100644
--- a/arch/arm/boot/dts/gemini-nas4220b.dts
+++ b/arch/arm/boot/dts/gemini-nas4220b.dts
@@ -76,7 +76,7 @@ phy0: ethernet-phy@1 {
 	};
 
 	soc {
-		flash@30000000 {
+		nand-controller@30000000 {
 			status = "okay";
 			/* 16MB of flash */
 			reg = <0x30000000 0x01000000>;
diff --git a/arch/arm/boot/dts/gemini-rut1xx.dts b/arch/arm/boot/dts/gemini-rut1xx.dts
index 08091d2a64e1..f8826a3b774f 100644
--- a/arch/arm/boot/dts/gemini-rut1xx.dts
+++ b/arch/arm/boot/dts/gemini-rut1xx.dts
@@ -70,7 +70,7 @@ phy0: ethernet-phy@1 {
 	};
 
 	soc {
-		flash@30000000 {
+		nand-controller@30000000 {
 			status = "okay";
 			/* 8MB of flash */
 			reg = <0x30000000 0x00800000>;
@@ -124,7 +124,6 @@ ethernet-port@1 {
 				/* Not used in this platform */
 			};
 		};
-
 		usb@68000000 {
 			status = "okay";
 		};
diff --git a/arch/arm/boot/dts/gemini-sl93512r.dts b/arch/arm/boot/dts/gemini-sl93512r.dts
index a0916d3c1059..995be04425b7 100644
--- a/arch/arm/boot/dts/gemini-sl93512r.dts
+++ b/arch/arm/boot/dts/gemini-sl93512r.dts
@@ -138,7 +138,7 @@ fixed-link {
 
 
 	soc {
-		flash@30000000 {
+		nand-controller@30000000 {
 			status = "okay";
 			/* 16MB of flash */
 			reg = <0x30000000 0x01000000>;
diff --git a/arch/arm/boot/dts/gemini-sq201.dts b/arch/arm/boot/dts/gemini-sq201.dts
index 0c6e6d35bfaa..df6146aaff4b 100644
--- a/arch/arm/boot/dts/gemini-sq201.dts
+++ b/arch/arm/boot/dts/gemini-sq201.dts
@@ -123,7 +123,7 @@ fixed-link {
 
 
 	soc {
-		flash@30000000 {
+		nand-controller@30000000 {
 			status = "okay";
 			pinctrl-names = "enabled", "disabled";
 			pinctrl-0 = <&pflash_default_pins>;
diff --git a/arch/arm/boot/dts/gemini-wbd111.dts b/arch/arm/boot/dts/gemini-wbd111.dts
index 0c47b2b9811c..f253743b1c55 100644
--- a/arch/arm/boot/dts/gemini-wbd111.dts
+++ b/arch/arm/boot/dts/gemini-wbd111.dts
@@ -82,7 +82,7 @@ phy0: ethernet-phy@1 {
 	};
 
 	soc {
-		flash@30000000 {
+		nand-controller@30000000 {
 			status = "okay";
 			/* 8MB of flash */
 			reg = <0x30000000 0x00800000>;
diff --git a/arch/arm/boot/dts/gemini-wbd222.dts b/arch/arm/boot/dts/gemini-wbd222.dts
index 52b4dbc0c072..76b6faaf806e 100644
--- a/arch/arm/boot/dts/gemini-wbd222.dts
+++ b/arch/arm/boot/dts/gemini-wbd222.dts
@@ -86,7 +86,7 @@ phy1: ethernet-phy@3 {
 	};
 
 	soc {
-		flash@30000000 {
+		nand-controller@30000000 {
 			status = "okay";
 			/* 8MB of flash */
 			reg = <0x30000000 0x00800000>;
diff --git a/arch/arm/boot/dts/gemini.dtsi b/arch/arm/boot/dts/gemini.dtsi
index 38671523dec5..5c8c5179c944 100644
--- a/arch/arm/boot/dts/gemini.dtsi
+++ b/arch/arm/boot/dts/gemini.dtsi
@@ -16,7 +16,7 @@ soc {
 		compatible = "simple-bus";
 		interrupt-parent = <&intcon>;
 
-		flash@30000000 {
+		nand: nand-controller@30000000 {
 			compatible = "cortina,gemini-flash", "cfi-flash";
 			syscon = <&syscon>;
 			pinctrl-names = "default";
-- 
2.26.3


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH] ARM: dts: gemini: rename to nand-controller

[Linus Walleij]

On Wed, Apr 28, 2021 at 7:55 PM Corentin Labbe <clabbe@baylibre.com> wrote:

> We must use nand-controller instead of flash.
>
> Signed-off-by: Corentin Labbe <clabbe@baylibre.com>

Hm, this flash memory isn't NAND, it is just memory-mapped
NOR flash.

The example for CFI NOR flash in
Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml
clearly uses the node name "flash@"

There is however a real NAND and serial flash memory
controller at 0x65000000, but I haven't seen a platform
that uses it.

The extra compatible string "cortina,gemini-flash"
turns on some Gemini-specific checks, but it
goes into the global system controller, not the NAND
controller, as the system controller confusingly have
some registers for detecting NOR memory config.
drivers/mtd/maps/physmap-gemini.c

Yours,
Linus Walleij

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel