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

Commit 3402a63d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-dt64-4.9' of... 

Merge tag 'imx-dt64-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt64

Pull "i.MX arm64 device tree changes for 4.9" from Shawn Guo:
 - Add property dma-coherent for ls2080a PCI device to save software
   cache maintenance.
 - Update serial aliases and use stdout-path to sepecify console for
   ls2080a and ls1043a boards.
 - Add DDR memory controller device node for ls2080a and ls1043a SoCs.

* tag 'imx-dt64-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  arm64: dts: ls2080a: Add 'dma-coherent' for ls2080a PCI nodes
  arm64: dts: add stdout-path to chosen node for ls2080a/ls1043a boards
  arm64: dts: updates serial aliases for ls1043a rdb and qds boards
  arm64: dts: Add DDR memory controller for Layerscape SoCs
parents 736ad004 e5f51a62

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

+8 −6
Original line number Diff line number Diff line
@@ -56,12 +56,14 @@ 
		gpio1 = &gpio2;

		gpio2 = &gpio3;

		gpio3 = &gpio4;

		serial0 = &lpuart0;

		serial1 = &lpuart1;

		serial2 = &lpuart2;

		serial3 = &lpuart3;

		serial4 = &lpuart4;

		serial5 = &lpuart5;

		serial0 = &duart0;

		serial1 = &duart1;

		serial2 = &duart2;

		serial3 = &duart3;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};

};

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

+8 −0
Original line number Diff line number Diff line
@@ -52,6 +52,14 @@ 


	aliases {

		crypto = &crypto;

		serial0 = &duart0;

		serial1 = &duart1;

		serial2 = &duart2;

		serial3 = &duart3;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};

};

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

+7 −0
Original line number Diff line number Diff line
@@ -247,6 +247,13 @@ 
			bus-width = <4>;

		};



		ddr: memory-controller@1080000 {

			compatible = "fsl,qoriq-memory-controller";

			reg = <0x0 0x1080000 0x0 0x1000>;

			interrupts = <0 144 0x4>;

			big-endian;

		};



		dspi0: dspi@2100000 {

			compatible = "fsl,ls1043a-dspi", "fsl,ls1021a-v1.0-dspi";

			#address-cells = <1>;

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

+3 −0
Original line number Diff line number Diff line
@@ -57,6 +57,9 @@ 
		serial1 = &serial1;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};

};



&esdhc {

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

+4 −0
Original line number Diff line number Diff line
@@ -56,6 +56,10 @@ 
		serial0 = &serial0;

		serial1 = &serial1;

	};



	chosen {

		stdout-path = "serial1:115200n8";

	};

};



&esdhc {