* [PATCH v2 1/2] Revert "arm64: dts: fsl: fix ifc simple-bus unit address format warnings"
@ 2018-03-26 16:20 Fabio Estevam
2018-03-26 16:20 ` [PATCH v2 2/2] Revert "dt-bindings: ifc: Fix the unit address format in the examples" Fabio Estevam
2018-03-27 8:01 ` [PATCH v2 1/2] Revert "arm64: dts: fsl: fix ifc simple-bus unit address format warnings" Shawn Guo
0 siblings, 2 replies; 3+ messages in thread
From: Fabio Estevam @ 2018-03-26 16:20 UTC (permalink / raw)
To: shawnguo; +Cc: Fabio Estevam, devicetree, robh+dt, linux-arm-kernel, leoyang.li
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>
---
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(-)
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] 3+ messages in thread* [PATCH v2 2/2] Revert "dt-bindings: ifc: Fix the unit address format in the examples"
2018-03-26 16:20 [PATCH v2 1/2] Revert "arm64: dts: fsl: fix ifc simple-bus unit address format warnings" Fabio Estevam
@ 2018-03-26 16:20 ` Fabio Estevam
2018-03-27 8:01 ` [PATCH v2 1/2] Revert "arm64: dts: fsl: fix ifc simple-bus unit address format warnings" Shawn Guo
1 sibling, 0 replies; 3+ messages in thread
From: Fabio Estevam @ 2018-03-26 16:20 UTC (permalink / raw)
To: shawnguo; +Cc: Fabio Estevam, devicetree, robh+dt, linux-arm-kernel, leoyang.li
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>
---
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(-)
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] 3+ messages in thread* Re: [PATCH v2 1/2] Revert "arm64: dts: fsl: fix ifc simple-bus unit address format warnings"
2018-03-26 16:20 [PATCH v2 1/2] Revert "arm64: dts: fsl: fix ifc simple-bus unit address format warnings" Fabio Estevam
2018-03-26 16:20 ` [PATCH v2 2/2] Revert "dt-bindings: ifc: Fix the unit address format in the examples" Fabio Estevam
@ 2018-03-27 8:01 ` Shawn Guo
1 sibling, 0 replies; 3+ messages in thread
From: Shawn Guo @ 2018-03-27 8:01 UTC (permalink / raw)
To: Fabio Estevam
Cc: Fabio Estevam, devicetree, robh+dt, linux-arm-kernel, leoyang.li
On Mon, Mar 26, 2018 at 01:20:42PM -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"."
>
> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Applied both, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-03-27 8:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-26 16:20 [PATCH v2 1/2] Revert "arm64: dts: fsl: fix ifc simple-bus unit address format warnings" Fabio Estevam
2018-03-26 16:20 ` [PATCH v2 2/2] Revert "dt-bindings: ifc: Fix the unit address format in the examples" Fabio Estevam
2018-03-27 8:01 ` [PATCH v2 1/2] 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).