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

Commit 610bf412 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-dt64-4.17-2' of... 

Merge tag 'imx-dt64-4.17-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt

Pull "Freescale arm64 device tree fixups for 4.17" from Shawn Guo:
 - It reverts a couple of patches that "fix" DTC warnings on IFC memory
   controller in a wrong way.  We will start over agagin to address the
   DTC warnings later.

* tag 'imx-dt64-4.17-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  Revert "dt-bindings: ifc: Fix the unit address format in the examples"
  Revert "arm64: dts: fsl: fix ifc simple-bus unit address format warnings"
parents 38d03be7 ee9c6430

Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt

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

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>;

	};