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

Commit 13ed63b6 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

Freescale arm64 device tree updates for 4.12:
 - Add support of LS2088A SoC, which is a derivative of existing
   LS2080A SoC, and the major difference is on ARM cores.
 - Add support of LS1088A SoC which includes eight Cortex-A53 cores
   with 32 KB L1 D-cache and I-cache respectively.
 - Add crypto and thermal device support for LS1012A platform.
 - Add ECC register region for SATA device on LS1012A, LS1043A and
   LS1046A platforms.

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

:
  dt-bindings: arm: Add entry for FSL LS1088A RDB, QDS boards
  dt-bindings: clockgen: Add compatible string for LS1088A
  arm64: dts: Add support for FSL's LS1088A SoC
  arm64: dts: ls1012a: add crypto node
  arm64: dts: ls1012a: add thermal monitor node
  arm64: dts: updated sata node on ls1012a platform
  arm64: dts: added ecc register address to sata node on ls1046a
  arm64: dts: added ecc register address to sata node on ls1043a
  arm64: dts: freescale: ls2088a: Add DTS support for FSL's LS2088A SoC
  arm64: dts: freescale: ls2080a: Split devicetree for code resuability
  dt-bindings: Add compatible for LS2088A QDS and RDB board

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents ab719074 6678254b

Documentation/devicetree/bindings/arm/fsl.txt

+23 −0
Original line number Diff line number Diff line
@@ -179,6 +179,18 @@ LS1046A ARMv8 based RDB Board 
Required root node properties:

    - compatible = "fsl,ls1046a-rdb", "fsl,ls1046a";



LS1088A SoC

Required root node properties:

    - compatible = "fsl,ls1088a";



LS1088A ARMv8 based QDS Board

Required root node properties:

    - compatible = "fsl,ls1088a-qds", "fsl,ls1088a";



LS1088A ARMv8 based RDB Board

Required root node properties:

    - compatible = "fsl,ls1088a-rdb", "fsl,ls1088a";



LS2080A SoC

Required root node properties:

    - compatible = "fsl,ls2080a";
@@ -195,3 +207,14 @@ LS2080A ARMv8 based RDB Board 
Required root node properties:

    - compatible = "fsl,ls2080a-rdb", "fsl,ls2080a";



LS2088A SoC

Required root node properties:

    - compatible = "fsl,ls2088a";



LS2088A ARMv8 based QDS Board

Required root node properties:

    - compatible = "fsl,ls2088a-qds", "fsl,ls2088a";



LS2088A ARMv8 based RDB Board

Required root node properties:

    - compatible = "fsl,ls2088a-rdb", "fsl,ls2088a";

Documentation/devicetree/bindings/clock/qoriq-clock.txt

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ Required properties: 
	* "fsl,ls1021a-clockgen"

	* "fsl,ls1043a-clockgen"

	* "fsl,ls1046a-clockgen"

	* "fsl,ls1088a-clockgen"

	* "fsl,ls2080a-clockgen"

	Chassis-version clock strings include:

	* "fsl,qoriq-clockgen-1.0": for chassis 1.0 clocks

arch/arm64/boot/dts/freescale/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -5,9 +5,13 @@ dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1043a-qds.dtb 
dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1043a-rdb.dtb

dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1046a-qds.dtb

dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1046a-rdb.dtb

dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1088a-qds.dtb

dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1088a-rdb.dtb

dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls2080a-qds.dtb

dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls2080a-rdb.dtb

dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls2080a-simu.dtb

dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls2088a-qds.dtb

dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls2088a-rdb.dtb

 

always		:= $(dtb-y)

subdir-y	:= $(dts-dirs)

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

+4 −0
Original line number Diff line number Diff line
@@ -113,3 +113,7 @@ 
&sai2 {

	status = "okay";

};



&sata {

	status = "okay";

};

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

+4 −0
Original line number Diff line number Diff line
@@ -126,3 +126,7 @@ 
&sai2 {

	status = "okay";

};



&sata {

	status = "okay";

};