mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-10 18:53:38 +00:00
Revert "arm64: dts: fsl: fix ifc simple-bus unit address format warnings"
This reverts commit f81d7af795
.
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>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
This commit is contained in:
parent
4e017f1419
commit
3ed9847800
7 changed files with 19 additions and 19 deletions
|
@ -84,19 +84,19 @@ &ifc {
|
|||
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>;
|
||||
};
|
||||
|
|
|
@ -97,7 +97,7 @@ &ifc {
|
|||
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 @@ nor@0 {
|
|||
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>;
|
||||
};
|
||||
|
|
|
@ -175,19 +175,19 @@ &ifc {
|
|||
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>;
|
||||
};
|
||||
|
|
|
@ -122,14 +122,14 @@ &ifc {
|
|||
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>;
|
||||
};
|
||||
|
|
|
@ -116,19 +116,19 @@ &ifc {
|
|||
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>;
|
||||
};
|
||||
|
|
|
@ -99,12 +99,12 @@ &ifc {
|
|||
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>;
|
||||
};
|
||||
|
|
|
@ -58,7 +58,7 @@ &ifc {
|
|||
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 @@ nor@0 {
|
|||
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";
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue