diff options
author | Fabio Estevam <fabio.estevam@nxp.com> | 2018-03-26 13:20:42 -0300 |
---|---|---|
committer | Shawn Guo <shawnguo@kernel.org> | 2018-03-27 16:00:01 +0800 |
commit | 3ed984780074260769aa30c04c4d83e08b1401ec (patch) | |
tree | 5319370ca15e39612989867986d8f0b5741cf8da /arch | |
parent | 4e017f1419397473cf3db6e9fa020013998b1aa4 (diff) | |
download | linux-3ed984780074260769aa30c04c4d83e08b1401ec.tar.bz2 |
Revert "arm64: dts: fsl: fix ifc simple-bus unit address format warnings"
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>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'arch')
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 3a09297dc0ef..6341281485cf 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 0a82bf941e11..3dc0c8e9663d 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 410dc61fe10a..434383bade0e 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 18d3c5bccfd1..5dc2782e2a58 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 0b96d6d4fe71..30128051d0c0 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 3d57008e70e8..4f17601b919c 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 5ac34126bfe1..1de618801c73 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"; }; |