Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ed98478 authored by Fabio Estevam's avatar Fabio Estevam Committed by Shawn Guo
Browse files

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



This reverts commit f81d7af7.

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: default avatarFabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 4e017f14

arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts

+3 −3
Original line number Diff line number Diff line
@@ -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>;

	};

arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts

+3 −3
Original line number Diff line number Diff line
@@ -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>;

		};

arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts

+3 −3
Original line number Diff line number Diff line
@@ -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>;

	};

arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts

+2 −2
Original line number Diff line number Diff line
@@ -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>;

	};

arch/arm64/boot/dts/freescale/fsl-ls1088a-qds.dts

+3 −3
Original line number Diff line number Diff line
@@ -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>;

	};