Skip to contentSkip to conversation

Revert "arm64: dts: fsl: fix ifc simple-bus unit address format warnings"

PATCH New Fabio Estevam 2 participants 3 messages Mar 26, 2018 – Mar 27, 2018

Subsystems (3)
Device tree bindings Arm i.MX and Layerscape Memory controller drivers
lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH v2 1/2 Revert "arm64: dts: fsl: fix ifc simple-bus unit address format warnings"

From: Fabio Estevam <[email protected]>

This reverts commit f81d7af7957539b7808961f929f945381530acb9.

As explained by Rob Herring:

"This "fix" is wrong. Memory controllers with chip selects should have the chip select in the unit-address. The correct fix here is you should drop "simple-bus"."

Signed-off-by Fabio Estevam <[email protected]>

---
Changes since v1:
- Only send the revert patches for now.

 arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts  | 6 +++---
 arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts  | 6 +++---
 arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts  | 6 +++---
 arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts  | 4 ++--
 arch/arm64/boot/dts/freescale/fsl-ls1088a-qds.dts  | 6 +++---
 arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts  | 4 ++--
 arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi | 6 +++---
 7 files changed, 19 insertions(+), 19 deletions(-)
arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts +3 -3
index 3a09297..6341281 100644
@@ -84,19 +84,19 @@
 		  0x2 0x0 0x0 0x7fb00000 0x00000100>;
 	status = "okay";
 
-	nor at 0 {
+	nor at 0,0 {
 		compatible = "cfi-flash";
 		reg = <0x0 0x0 0x8000000>;
 		bank-width = <2>;
 		device-width = <1>;
 	};
 
-	nand at 100000000 {
+	nand at 1,0 {
 		compatible = "fsl,ifc-nand";
 		reg = <0x1 0x0 0x10000>;
 	};
 
-	fpga: board-control at 200000000 {
+	fpga: board-control at 2,0 {
 		compatible = "fsl,ls1043aqds-fpga", "fsl,fpga-qixis";
 		reg = <0x2 0x0 0x0000100>;
 	};
arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts +3 -3
index 0a82bf9..3dc0c8e 100644
@@ -97,7 +97,7 @@
 		  0x1 0x0 0x0 0x7e800000 0x00010000
 		  0x2 0x0 0x0 0x7fb00000 0x00000100>;
 
-		nor at 0 {
+		nor at 0,0 {
 			compatible = "cfi-flash";
 			#address-cells = <1>;
 			#size-cells = <1>;

@@ -106,14 +106,14 @@
 			device-width = <1>;
 		};
 
-		nand at 100000000 {
+		nand at 1,0 {
 			compatible = "fsl,ifc-nand";
 			#address-cells = <1>;
 			#size-cells = <1>;
 			reg = <0x1 0x0 0x10000>;
 		};
 
-		cpld: board-control at 200000000 {
+		cpld: board-control at 2,0 {
 			compatible = "fsl,ls1043ardb-cpld";
 			reg = <0x2 0x0 0x0000100>;
 		};
arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts +3 -3
index 410dc61..434383b 100644
@@ -175,19 +175,19 @@
 		  0x2 0x0 0x0 0x7fb00000 0x00000100>;
 	status = "okay";
 
-	nor at 0 {
+	nor at 0,0 {
 		compatible = "cfi-flash";
 		reg = <0x0 0x0 0x8000000>;
 		bank-width = <2>;
 		device-width = <1>;
 	};
 
-	nand at 100000000 {
+	nand at 1,0 {
 		compatible = "fsl,ifc-nand";
 		reg = <0x1 0x0 0x10000>;
 	};
 
-	fpga: board-control at 200000000 {
+	fpga: board-control at 2,0 {
 		compatible = "fsl,ls1046aqds-fpga", "fsl,fpga-qixis";
 		reg = <0x2 0x0 0x0000100>;
 	};
arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts +2 -2
index 18d3c5b..5dc2782 100644
@@ -122,14 +122,14 @@
 		  0x2 0x0 0x0 0x7fb00000 0x00000100>;
 	status = "okay";
 
-	nand at 0 {
+	nand at 0,0 {
 		compatible = "fsl,ifc-nand";
 		#address-cells = <1>;
 		#size-cells = <1>;
 		reg = <0x0 0x0 0x10000>;
 	};
 
-	cpld: board-control at 200000000 {
+	cpld: board-control at 2,0 {
 		compatible = "fsl,ls1046ardb-cpld";
 		reg = <0x2 0x0 0x0000100>;
 	};
arch/arm64/boot/dts/freescale/fsl-ls1088a-qds.dts +3 -3
index 0b96d6d..3012805 100644
@@ -116,19 +116,19 @@
 		  3 0 0x5 0x20000000 0x00010000>;
 	status = "okay";
 
-	nor at 0 {
+	nor at 0,0 {
 		compatible = "cfi-flash";
 		reg = <0x0 0x0 0x8000000>;
 		bank-width = <2>;
 		device-width = <1>;
 	};
 
-	nand at 200000000 {
+	nand at 2,0 {
 		compatible = "fsl,ifc-nand";
 		reg = <0x2 0x0 0x10000>;
 	};
 
-	fpga: board-control at 300000000 {
+	fpga: board-control at 3,0 {
 		compatible = "fsl,ls1088aqds-fpga", "fsl,fpga-qixis";
 		reg = <0x3 0x0 0x0000100>;
 	};
arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts +2 -2
index 3d57008e..4f17601 100644
@@ -99,12 +99,12 @@
 		  2 0 0x5 0x20000000 0x00010000>;
 	status = "okay";
 
-	nand at 0 {
+	nand at 0,0 {
 		compatible = "fsl,ifc-nand";
 		reg = <0x0 0x0 0x10000>;
 	};
 
-	fpga: board-control at 200000000 {
+	fpga: board-control at 2,0 {
 		compatible = "fsl,ls1088ardb-fpga", "fsl,fpga-qixis";
 		reg = <0x2 0x0 0x0000100>;
 	};
arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi +3 -3
index 5ac3412..1de6188 100644
@@ -58,7 +58,7 @@
 		  0x2 0x0 0x5 0x30000000 0x00010000
 		  0x3 0x0 0x5 0x20000000 0x00010000>;
 
-	nor at 0 {
+	nor at 0,0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "cfi-flash";

@@ -67,12 +67,12 @@
 		device-width = <1>;
 	};
 
-	nand at 200000000 {
+	nand at 2,0 {
 	     compatible = "fsl,ifc-nand";
 	     reg = <0x2 0x0 0x10000>;
 	};
 
-	cpld at 300000000 {
+	cpld at 3,0 {
 	     reg = <0x3 0x0 0x10000>;
 	     compatible = "fsl,ls2080aqds-fpga", "fsl,fpga-qixis";
 	};
Signature · 1 line
2.7.4
author reviewer
#1 lore raw

PATCH v2 2/2 Revert "dt-bindings: ifc: Fix the unit address format in the examples"

From: Fabio Estevam <[email protected]>

This reverts commit 4e017f1419397473cf3db6e9fa020013998b1aa4.

As explained by Rob Herring:

"This "fix" is wrong. Memory controllers with chip selects should have the chip select in the unit-address. The correct fix here is you should drop "simple-bus"."

Signed-off-by Fabio Estevam <[email protected]>

---
Changes since v1:
- Only send the revert patches for now.

 Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt +3 -3
index a4d4b6a..89427b0 100644
@@ -43,7 +43,7 @@ Example:
 			  0x1 0x0 0x0 0xffa00000 0x00010000
 			  0x3 0x0 0x0 0xffb00000 0x00020000>;
 
-		flash at 0 {
+		flash at 0,0 {
 			#address-cells = <1>;
 			#size-cells = <1>;
 			compatible = "cfi-flash";

@@ -58,7 +58,7 @@ Example:
 			};
 		};
 
-		flash at 100000000 {
+		flash at 1,0 {
 			#address-cells = <1>;
 			#size-cells = <1>;
 			compatible = "fsl,ifc-nand";

@@ -73,7 +73,7 @@ Example:
 			};
 		};
 
-		cpld@@300000000 {
+		cpld at 3,0 {
 			#address-cells = <1>;
 			#size-cells = <1>;
 			compatible = "fsl,p1010rdb-cpld";
Signature · 1 line
2.7.4
Applied
#2 lore raw

PATCH v2 1/2 Revert "arm64: dts: fsl: fix ifc simple-bus unit address format warnings"

In reply to Fabio Estevam
Quoted 11 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

This reverts commit f81d7af7957539b7808961f929f945381530acb9.

As explained by Rob Herring:

"This "fix" is wrong. Memory controllers with chip selects should have the chip select in the unit-address. The correct fix here is you should drop "simple-bus"."

Signed-off-by Fabio Estevam <[email protected]>

Applied both, thanks.