* [PATCH 1/4] Revert "arm64: dts: fsl: fix ifc simple-bus unit address format warnings"
@ 2018-03-18 14:17 Fabio Estevam
2018-03-18 14:17 ` [PATCH 2/4] arm64: dts: ls: Remove "simple-bus" from ifc compatible Fabio Estevam
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Fabio Estevam @ 2018-03-18 14:17 UTC (permalink / raw)
To: shawnguo; +Cc: robh+dt, devicetree, Fabio Estevam
From: Fabio Estevam <fabio.estevam@nxp.com>
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 <fabio.estevam@nxp.com>
---
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(-)
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts
index 3a09297..6341281 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts
@@ -84,19 +84,19 @@
0x2 0x0 0x0 0x7fb00000 0x00000100>;
status = "okay";
- nor@0 {
+ nor@0,0 {
compatible = "cfi-flash";
reg = <0x0 0x0 0x8000000>;
bank-width = <2>;
device-width = <1>;
};
- nand@100000000 {
+ nand@1,0 {
compatible = "fsl,ifc-nand";
reg = <0x1 0x0 0x10000>;
};
- fpga: board-control@200000000 {
+ fpga: board-control@2,0 {
compatible = "fsl,ls1043aqds-fpga", "fsl,fpga-qixis";
reg = <0x2 0x0 0x0000100>;
};
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts
index 0a82bf9..3dc0c8e 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts
@@ -97,7 +97,7 @@
0x1 0x0 0x0 0x7e800000 0x00010000
0x2 0x0 0x0 0x7fb00000 0x00000100>;
- nor@0 {
+ nor@0,0 {
compatible = "cfi-flash";
#address-cells = <1>;
#size-cells = <1>;
@@ -106,14 +106,14 @@
device-width = <1>;
};
- nand@100000000 {
+ nand@1,0 {
compatible = "fsl,ifc-nand";
#address-cells = <1>;
#size-cells = <1>;
reg = <0x1 0x0 0x10000>;
};
- cpld: board-control@200000000 {
+ cpld: board-control@2,0 {
compatible = "fsl,ls1043ardb-cpld";
reg = <0x2 0x0 0x0000100>;
};
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts
index 410dc61..434383b 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts
@@ -175,19 +175,19 @@
0x2 0x0 0x0 0x7fb00000 0x00000100>;
status = "okay";
- nor@0 {
+ nor@0,0 {
compatible = "cfi-flash";
reg = <0x0 0x0 0x8000000>;
bank-width = <2>;
device-width = <1>;
};
- nand@100000000 {
+ nand@1,0 {
compatible = "fsl,ifc-nand";
reg = <0x1 0x0 0x10000>;
};
- fpga: board-control@200000000 {
+ fpga: board-control@2,0 {
compatible = "fsl,ls1046aqds-fpga", "fsl,fpga-qixis";
reg = <0x2 0x0 0x0000100>;
};
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts
index 18d3c5b..5dc2782 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts
@@ -122,14 +122,14 @@
0x2 0x0 0x0 0x7fb00000 0x00000100>;
status = "okay";
- nand@0 {
+ nand@0,0 {
compatible = "fsl,ifc-nand";
#address-cells = <1>;
#size-cells = <1>;
reg = <0x0 0x0 0x10000>;
};
- cpld: board-control@200000000 {
+ cpld: board-control@2,0 {
compatible = "fsl,ls1046ardb-cpld";
reg = <0x2 0x0 0x0000100>;
};
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1088a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-ls1088a-qds.dts
index 0b96d6d..3012805 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1088a-qds.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1088a-qds.dts
@@ -116,19 +116,19 @@
3 0 0x5 0x20000000 0x00010000>;
status = "okay";
- nor@0 {
+ nor@0,0 {
compatible = "cfi-flash";
reg = <0x0 0x0 0x8000000>;
bank-width = <2>;
device-width = <1>;
};
- nand@200000000 {
+ nand@2,0 {
compatible = "fsl,ifc-nand";
reg = <0x2 0x0 0x10000>;
};
- fpga: board-control@300000000 {
+ fpga: board-control@3,0 {
compatible = "fsl,ls1088aqds-fpga", "fsl,fpga-qixis";
reg = <0x3 0x0 0x0000100>;
};
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts
index 3d57008e..4f17601 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts
@@ -99,12 +99,12 @@
2 0 0x5 0x20000000 0x00010000>;
status = "okay";
- nand@0 {
+ nand@0,0 {
compatible = "fsl,ifc-nand";
reg = <0x0 0x0 0x10000>;
};
- fpga: board-control@200000000 {
+ fpga: board-control@2,0 {
compatible = "fsl,ls1088ardb-fpga", "fsl,fpga-qixis";
reg = <0x2 0x0 0x0000100>;
};
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi
index 5ac3412..1de6188 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi
@@ -58,7 +58,7 @@
0x2 0x0 0x5 0x30000000 0x00010000
0x3 0x0 0x5 0x20000000 0x00010000>;
- nor@0 {
+ nor@0,0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "cfi-flash";
@@ -67,12 +67,12 @@
device-width = <1>;
};
- nand@200000000 {
+ nand@2,0 {
compatible = "fsl,ifc-nand";
reg = <0x2 0x0 0x10000>;
};
- cpld@300000000 {
+ cpld@3,0 {
reg = <0x3 0x0 0x10000>;
compatible = "fsl,ls2080aqds-fpga", "fsl,fpga-qixis";
};
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 2/4] arm64: dts: ls: Remove "simple-bus" from ifc compatible 2018-03-18 14:17 [PATCH 1/4] Revert "arm64: dts: fsl: fix ifc simple-bus unit address format warnings" Fabio Estevam @ 2018-03-18 14:17 ` Fabio Estevam 2018-03-26 22:23 ` Rob Herring 2018-03-18 14:17 ` [PATCH 3/4] Revert "dt-bindings: ifc: Fix the unit address format in the examples" Fabio Estevam ` (2 subsequent siblings) 3 siblings, 1 reply; 8+ messages in thread From: Fabio Estevam @ 2018-03-18 14:17 UTC (permalink / raw) To: shawnguo; +Cc: robh+dt, devicetree, Fabio Estevam From: Fabio Estevam <fabio.estevam@nxp.com> Currently the following dtc warnings are seen when building with W=1: Warning (simple_bus_reg): Node /soc/ifc@1530000/nor@0,0 simple-bus unit address format error, expected "0" Warning (simple_bus_reg): Node /soc/ifc@1530000/nand@1,0 simple-bus unit address format error, expected "100000000" Warning (simple_bus_reg): Node /soc/ifc@1530000/board-control@2,0 simple-bus unit address format error, expect" Remove the "simple-bus" from the ifc compatible string to fix these warnings. Suggested-by: Rob Herring <robh@kernel.org> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> --- arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 2 +- arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 2 +- arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 2 +- arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi index 1109f22..579848a 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi @@ -312,7 +312,7 @@ }; ifc: ifc@1530000 { - compatible = "fsl,ifc", "simple-bus"; + compatible = "fsl,ifc"; reg = <0x0 0x1530000 0x0 0x10000>; big-endian; interrupts = <0 43 0x4>; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi index 136ebfa..bde848b 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi @@ -230,7 +230,7 @@ }; ifc: ifc@1530000 { - compatible = "fsl,ifc", "simple-bus"; + compatible = "fsl,ifc"; reg = <0x0 0x1530000 0x0 0x10000>; big-endian; interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi index 1c6556b..73d16bc 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi @@ -410,7 +410,7 @@ }; ifc: ifc@2240000 { - compatible = "fsl,ifc", "simple-bus"; + compatible = "fsl,ifc"; reg = <0x0 0x2240000 0x0 0x20000>; interrupts = <0 21 IRQ_TYPE_LEVEL_HIGH>; little-endian; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi index 137ef4d..bf2b0af 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi @@ -619,7 +619,7 @@ }; ifc: ifc@2240000 { - compatible = "fsl,ifc", "simple-bus"; + compatible = "fsl,ifc"; reg = <0x0 0x2240000 0x0 0x20000>; interrupts = <0 21 0x4>; /* Level high type */ little-endian; -- 2.7.4 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 2/4] arm64: dts: ls: Remove "simple-bus" from ifc compatible 2018-03-18 14:17 ` [PATCH 2/4] arm64: dts: ls: Remove "simple-bus" from ifc compatible Fabio Estevam @ 2018-03-26 22:23 ` Rob Herring 0 siblings, 0 replies; 8+ messages in thread From: Rob Herring @ 2018-03-26 22:23 UTC (permalink / raw) To: Fabio Estevam; +Cc: shawnguo, devicetree, Fabio Estevam On Sun, Mar 18, 2018 at 11:17:29AM -0300, Fabio Estevam wrote: > From: Fabio Estevam <fabio.estevam@nxp.com> > > Currently the following dtc warnings are seen when building with W=1: > > Warning (simple_bus_reg): Node /soc/ifc@1530000/nor@0,0 simple-bus unit address format error, expected "0" > Warning (simple_bus_reg): Node /soc/ifc@1530000/nand@1,0 simple-bus unit address format error, expected "100000000" > Warning (simple_bus_reg): Node /soc/ifc@1530000/board-control@2,0 simple-bus unit address format error, expect" > > Remove the "simple-bus" from the ifc compatible string to fix these > warnings. > > Suggested-by: Rob Herring <robh@kernel.org> > Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> > --- > arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 2 +- > arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 2 +- > arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 2 +- > arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) Reviewed-by: Rob Herring <robh@kernel.org> ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 3/4] Revert "dt-bindings: ifc: Fix the unit address format in the examples" 2018-03-18 14:17 [PATCH 1/4] Revert "arm64: dts: fsl: fix ifc simple-bus unit address format warnings" Fabio Estevam 2018-03-18 14:17 ` [PATCH 2/4] arm64: dts: ls: Remove "simple-bus" from ifc compatible Fabio Estevam @ 2018-03-18 14:17 ` Fabio Estevam 2018-03-26 22:23 ` Rob Herring 2018-03-18 14:17 ` [PATCH 4/4] dt-bindings: ifc: Remove "simple-bus" from ifc compatible string Fabio Estevam 2018-03-26 14:44 ` [PATCH 1/4] Revert "arm64: dts: fsl: fix ifc simple-bus unit address format warnings" Shawn Guo 3 siblings, 1 reply; 8+ messages in thread From: Fabio Estevam @ 2018-03-18 14:17 UTC (permalink / raw) To: shawnguo; +Cc: robh+dt, devicetree, Fabio Estevam From: Fabio Estevam <fabio.estevam@nxp.com> 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 <fabio.estevam@nxp.com> --- Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt b/Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt index a4d4b6a..89427b0 100644 --- a/Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt +++ b/Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt @@ -43,7 +43,7 @@ Example: 0x1 0x0 0x0 0xffa00000 0x00010000 0x3 0x0 0x0 0xffb00000 0x00020000>; - flash@0 { + flash@0,0 { #address-cells = <1>; #size-cells = <1>; compatible = "cfi-flash"; @@ -58,7 +58,7 @@ Example: }; }; - flash@100000000 { + flash@1,0 { #address-cells = <1>; #size-cells = <1>; compatible = "fsl,ifc-nand"; @@ -73,7 +73,7 @@ Example: }; }; - cpld@@300000000 { + cpld@3,0 { #address-cells = <1>; #size-cells = <1>; compatible = "fsl,p1010rdb-cpld"; -- 2.7.4 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 3/4] Revert "dt-bindings: ifc: Fix the unit address format in the examples" 2018-03-18 14:17 ` [PATCH 3/4] Revert "dt-bindings: ifc: Fix the unit address format in the examples" Fabio Estevam @ 2018-03-26 22:23 ` Rob Herring 0 siblings, 0 replies; 8+ messages in thread From: Rob Herring @ 2018-03-26 22:23 UTC (permalink / raw) To: Fabio Estevam; +Cc: shawnguo, devicetree, Fabio Estevam On Sun, Mar 18, 2018 at 11:17:30AM -0300, Fabio Estevam wrote: > From: Fabio Estevam <fabio.estevam@nxp.com> > > 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 <fabio.estevam@nxp.com> > --- > Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) Reviewed-by: Rob Herring <robh@kernel.org> ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 4/4] dt-bindings: ifc: Remove "simple-bus" from ifc compatible string 2018-03-18 14:17 [PATCH 1/4] Revert "arm64: dts: fsl: fix ifc simple-bus unit address format warnings" Fabio Estevam 2018-03-18 14:17 ` [PATCH 2/4] arm64: dts: ls: Remove "simple-bus" from ifc compatible Fabio Estevam 2018-03-18 14:17 ` [PATCH 3/4] Revert "dt-bindings: ifc: Fix the unit address format in the examples" Fabio Estevam @ 2018-03-18 14:17 ` Fabio Estevam 2018-03-26 22:23 ` Rob Herring 2018-03-26 14:44 ` [PATCH 1/4] Revert "arm64: dts: fsl: fix ifc simple-bus unit address format warnings" Shawn Guo 3 siblings, 1 reply; 8+ messages in thread From: Fabio Estevam @ 2018-03-18 14:17 UTC (permalink / raw) To: shawnguo; +Cc: robh+dt, devicetree, Fabio Estevam From: Fabio Estevam <fabio.estevam@nxp.com>> DTC warnings will be seen if these examples are used in a real dts file due to a mismatch in the unit address notation. Remove "simple-bus" from the ifc compatible string to fix the warnings. Suggested-by: Rob Herring <robh@kernel.org> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> --- Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt b/Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt index 89427b0..2314871 100644 --- a/Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt +++ b/Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt @@ -31,7 +31,7 @@ like FPGAs, CPLDs, etc. Example: ifc@ffe1e000 { - compatible = "fsl,ifc", "simple-bus"; + compatible = "fsl,ifc"; #address-cells = <2>; #size-cells = <1>; reg = <0x0 0xffe1e000 0 0x2000>; -- 2.7.4 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 4/4] dt-bindings: ifc: Remove "simple-bus" from ifc compatible string 2018-03-18 14:17 ` [PATCH 4/4] dt-bindings: ifc: Remove "simple-bus" from ifc compatible string Fabio Estevam @ 2018-03-26 22:23 ` Rob Herring 0 siblings, 0 replies; 8+ messages in thread From: Rob Herring @ 2018-03-26 22:23 UTC (permalink / raw) To: Fabio Estevam; +Cc: shawnguo, devicetree, Fabio Estevam On Sun, Mar 18, 2018 at 11:17:31AM -0300, Fabio Estevam wrote: > From: Fabio Estevam <fabio.estevam@nxp.com>> > > DTC warnings will be seen if these examples are used in a real dts file > due to a mismatch in the unit address notation. > > Remove "simple-bus" from the ifc compatible string to fix the warnings. > > Suggested-by: Rob Herring <robh@kernel.org> > Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> > --- > Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Reviewed-by: Rob Herring <robh@kernel.org> ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/4] Revert "arm64: dts: fsl: fix ifc simple-bus unit address format warnings" 2018-03-18 14:17 [PATCH 1/4] Revert "arm64: dts: fsl: fix ifc simple-bus unit address format warnings" Fabio Estevam ` (2 preceding siblings ...) 2018-03-18 14:17 ` [PATCH 4/4] dt-bindings: ifc: Remove "simple-bus" from ifc compatible string Fabio Estevam @ 2018-03-26 14:44 ` Shawn Guo 3 siblings, 0 replies; 8+ messages in thread From: Shawn Guo @ 2018-03-26 14:44 UTC (permalink / raw) To: Fabio Estevam; +Cc: robh+dt, devicetree, Fabio Estevam On Sun, Mar 18, 2018 at 11:17:28AM -0300, Fabio Estevam wrote: > From: Fabio Estevam <fabio.estevam@nxp.com> > > 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"." Right, Rob talked to me about this last week during Linaro Connect. > > Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> The series should be copied to LAKML as well. Also, I suspect that we will have regressions if we drop "simple-bus" from IFC node right now, because the child devices will likely not get populated. I would suggest that you resend two reverting patches firstly, and send the other two separately later with someone being able to test the changes on copy, to make sure we do not break things. Shawn > --- > 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(-) > > diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts > index 3a09297..6341281 100644 > --- a/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts > +++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts > @@ -84,19 +84,19 @@ > 0x2 0x0 0x0 0x7fb00000 0x00000100>; > status = "okay"; > > - nor@0 { > + nor@0,0 { > compatible = "cfi-flash"; > reg = <0x0 0x0 0x8000000>; > bank-width = <2>; > device-width = <1>; > }; > > - nand@100000000 { > + nand@1,0 { > compatible = "fsl,ifc-nand"; > reg = <0x1 0x0 0x10000>; > }; > > - fpga: board-control@200000000 { > + fpga: board-control@2,0 { > compatible = "fsl,ls1043aqds-fpga", "fsl,fpga-qixis"; > reg = <0x2 0x0 0x0000100>; > }; > diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts > index 0a82bf9..3dc0c8e 100644 > --- a/arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts > +++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts > @@ -97,7 +97,7 @@ > 0x1 0x0 0x0 0x7e800000 0x00010000 > 0x2 0x0 0x0 0x7fb00000 0x00000100>; > > - nor@0 { > + nor@0,0 { > compatible = "cfi-flash"; > #address-cells = <1>; > #size-cells = <1>; > @@ -106,14 +106,14 @@ > device-width = <1>; > }; > > - nand@100000000 { > + nand@1,0 { > compatible = "fsl,ifc-nand"; > #address-cells = <1>; > #size-cells = <1>; > reg = <0x1 0x0 0x10000>; > }; > > - cpld: board-control@200000000 { > + cpld: board-control@2,0 { > compatible = "fsl,ls1043ardb-cpld"; > reg = <0x2 0x0 0x0000100>; > }; > diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts > index 410dc61..434383b 100644 > --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts > +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts > @@ -175,19 +175,19 @@ > 0x2 0x0 0x0 0x7fb00000 0x00000100>; > status = "okay"; > > - nor@0 { > + nor@0,0 { > compatible = "cfi-flash"; > reg = <0x0 0x0 0x8000000>; > bank-width = <2>; > device-width = <1>; > }; > > - nand@100000000 { > + nand@1,0 { > compatible = "fsl,ifc-nand"; > reg = <0x1 0x0 0x10000>; > }; > > - fpga: board-control@200000000 { > + fpga: board-control@2,0 { > compatible = "fsl,ls1046aqds-fpga", "fsl,fpga-qixis"; > reg = <0x2 0x0 0x0000100>; > }; > diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts > index 18d3c5b..5dc2782 100644 > --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts > +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts > @@ -122,14 +122,14 @@ > 0x2 0x0 0x0 0x7fb00000 0x00000100>; > status = "okay"; > > - nand@0 { > + nand@0,0 { > compatible = "fsl,ifc-nand"; > #address-cells = <1>; > #size-cells = <1>; > reg = <0x0 0x0 0x10000>; > }; > > - cpld: board-control@200000000 { > + cpld: board-control@2,0 { > compatible = "fsl,ls1046ardb-cpld"; > reg = <0x2 0x0 0x0000100>; > }; > diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1088a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-ls1088a-qds.dts > index 0b96d6d..3012805 100644 > --- a/arch/arm64/boot/dts/freescale/fsl-ls1088a-qds.dts > +++ b/arch/arm64/boot/dts/freescale/fsl-ls1088a-qds.dts > @@ -116,19 +116,19 @@ > 3 0 0x5 0x20000000 0x00010000>; > status = "okay"; > > - nor@0 { > + nor@0,0 { > compatible = "cfi-flash"; > reg = <0x0 0x0 0x8000000>; > bank-width = <2>; > device-width = <1>; > }; > > - nand@200000000 { > + nand@2,0 { > compatible = "fsl,ifc-nand"; > reg = <0x2 0x0 0x10000>; > }; > > - fpga: board-control@300000000 { > + fpga: board-control@3,0 { > compatible = "fsl,ls1088aqds-fpga", "fsl,fpga-qixis"; > reg = <0x3 0x0 0x0000100>; > }; > diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts > index 3d57008e..4f17601 100644 > --- a/arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts > +++ b/arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts > @@ -99,12 +99,12 @@ > 2 0 0x5 0x20000000 0x00010000>; > status = "okay"; > > - nand@0 { > + nand@0,0 { > compatible = "fsl,ifc-nand"; > reg = <0x0 0x0 0x10000>; > }; > > - fpga: board-control@200000000 { > + fpga: board-control@2,0 { > compatible = "fsl,ls1088ardb-fpga", "fsl,fpga-qixis"; > reg = <0x2 0x0 0x0000100>; > }; > diff --git a/arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi > index 5ac3412..1de6188 100644 > --- a/arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi > +++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi > @@ -58,7 +58,7 @@ > 0x2 0x0 0x5 0x30000000 0x00010000 > 0x3 0x0 0x5 0x20000000 0x00010000>; > > - nor@0 { > + nor@0,0 { > #address-cells = <1>; > #size-cells = <1>; > compatible = "cfi-flash"; > @@ -67,12 +67,12 @@ > device-width = <1>; > }; > > - nand@200000000 { > + nand@2,0 { > compatible = "fsl,ifc-nand"; > reg = <0x2 0x0 0x10000>; > }; > > - cpld@300000000 { > + cpld@3,0 { > reg = <0x3 0x0 0x10000>; > compatible = "fsl,ls2080aqds-fpga", "fsl,fpga-qixis"; > }; > -- > 2.7.4 > ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2018-03-26 22:23 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2018-03-18 14:17 [PATCH 1/4] Revert "arm64: dts: fsl: fix ifc simple-bus unit address format warnings" Fabio Estevam 2018-03-18 14:17 ` [PATCH 2/4] arm64: dts: ls: Remove "simple-bus" from ifc compatible Fabio Estevam 2018-03-26 22:23 ` Rob Herring 2018-03-18 14:17 ` [PATCH 3/4] Revert "dt-bindings: ifc: Fix the unit address format in the examples" Fabio Estevam 2018-03-26 22:23 ` Rob Herring 2018-03-18 14:17 ` [PATCH 4/4] dt-bindings: ifc: Remove "simple-bus" from ifc compatible string Fabio Estevam 2018-03-26 22:23 ` Rob Herring 2018-03-26 14:44 ` [PATCH 1/4] Revert "arm64: dts: fsl: fix ifc simple-bus unit address format warnings" Shawn Guo
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).