Commit ca2fbd9a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Freescale arm64 device tree update for 4.20:
 - Add the second Dual UART device for LS208xA SoCs.
 - Add necessary big-endian property for NOR device on LS104xA based
   boards, remove unneeded big-endian property from IFC controller.
 - DTC has new checks for I2C and SPI buses to land into 4.20.  A patch
   from Rob to fix the bus node names and warnings in unit-addresses.

* tag 'imx-dt64-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux

:
  arm64: dts: fsl: Fix I2C and SPI bus warnings
  arm64: dts: ls208xa: add second duart
  arm64: dts: fsl: remove big-endian field from IFC controller
  arm64: dts: Add big-endian in nor node for ls104xa

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 476ca77f b739c177

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

+1 −1
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ 
			status = "disabled";

		};



		dspi: dspi@2100000 {

		dspi: spi@2100000 {

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

			#address-cells = <1>;

			#size-cells = <0>;

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

+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 * Device Tree Include file for Freescale Layerscape-1043A family SoC.

 *

 * Copyright 2014-2015 Freescale Semiconductor, Inc.

 * Copyright 2018 NXP

 *

 * Mingkai Hu <Mingkai.hu@freescale.com>

 */
@@ -50,6 +51,7 @@ 
	nor@0,0 {

		compatible = "cfi-flash";

		reg = <0x0 0x0 0x8000000>;

		big-endian;

		bank-width = <2>;

		device-width = <1>;

	};

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

+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 * Device Tree Include file for Freescale Layerscape-1043A family SoC.

 *

 * Copyright 2014-2015 Freescale Semiconductor, Inc.

 * Copyright 2018 NXP

 *

 * Mingkai Hu <Mingkai.hu@freescale.com>

 */
@@ -65,6 +66,7 @@ 
			#address-cells = <1>;

			#size-cells = <1>;

			reg = <0x0 0x0 0x8000000>;

			big-endian;

			bank-width = <2>;

			device-width = <1>;

		};

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

+4 −4
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 * Device Tree Include file for Freescale Layerscape-1043A family SoC.

 *

 * Copyright 2014-2015 Freescale Semiconductor, Inc.

 * Copyright 2018 NXP

 *

 * Mingkai Hu <Mingkai.hu@freescale.com>

 */
@@ -280,11 +281,10 @@ 
		ifc: ifc@1530000 {

			compatible = "fsl,ifc", "simple-bus";

			reg = <0x0 0x1530000 0x0 0x10000>;

			big-endian;

			interrupts = <0 43 0x4>;

		};



		qspi: quadspi@1550000 {

		qspi: spi@1550000 {

			compatible = "fsl,ls1043a-qspi", "fsl,ls1021a-qspi";

			#address-cells = <1>;

			#size-cells = <0>;
@@ -382,7 +382,7 @@ 
			ranges = <0x0 0x5 0x00000000 0x8000000>;

		};



		dspi0: dspi@2100000 {

		dspi0: spi@2100000 {

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

			#address-cells = <1>;

			#size-cells = <0>;
@@ -395,7 +395,7 @@ 
			status = "disabled";

		};



		dspi1: dspi@2110000 {

		dspi1: spi@2110000 {

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

			#address-cells = <1>;

			#size-cells = <0>;

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

+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 * Device Tree Include file for Freescale Layerscape-1046A family SoC.

 *

 * Copyright 2016 Freescale Semiconductor, Inc.

 * Copyright 2018 NXP

 *

 * Shaohui Xie <Shaohui.Xie@nxp.com>

 */
@@ -141,6 +142,7 @@ 
	nor@0,0 {

		compatible = "cfi-flash";

		reg = <0x0 0x0 0x8000000>;

		big-endian;

		bank-width = <2>;

		device-width = <1>;

	};

CRA Git | Maintained and supported by SUSTech CRA and CCSE