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

Commit c6778ff8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM 64-bit DT updates from Olof Johansson:
 "Device-tree updates for arm64 platforms. Just as with 32-bit, a bunch
  of smaller changes, but also some new platforms that are worth
  mentioning:

   - Rockchip RK3399 platforms for Chromebooks, including Samsung
     Chromebook Plus (Kevin)

   - Orange Pi PC2 (Allwinner H5)

   - Freescale LS2088A and LS1088A SoCs

   - Expanded support for Nvidia Tegra186 (and Jetson TX2)"

* tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (180 commits)
  arm64: dts: Add basic DT to support Spreadtrum's SP9860G
  arm64: dts: exynos: Use - instead of @ for DT OPP entries
  arm64: dts: exynos: Add support for s6e3hf2 panel device on TM2e board
  arm64: dts: juno: add information about L1 and L2 caches
  arm64: dts: juno: fix few unit address format warnings
  arm64: marvell: dts: enable the crypto engine on the Armada 8040 DB
  arm64: marvell: dts: enable the crypto engine on the Armada 7040 DB
  arm64: marvell: dts: add crypto engine description for 7k/8k
  arm64: dts: marvell: add sdhci support for Armada 7K/8K
  arm64: dts: marvell: add eMMC support for Armada 37xx
  arm64: dts: hisi: add pinctrl dtsi file for HiKey960 development board
  arm64: dts: hisi: add drive strength levels of the pins for Hi3660 SoC
  arm64: dts: hisi: enable the NIC and SAS for the hip07-d05 board
  arm64: dts: hisi: add SAS nodes for the hip07 SoC
  arm64: dts: hisi: add RoCE nodes for the hip07 SoC
  arm64: dts: hisi: add network related nodes for the hip07 SoC
  arm64: dts: hisi: add mbigen nodes for the hip07 SoC
  arm64: dts: rockchip: fix the memory size of PX5 Evaluation board
  arm64: dts: hisilicon: add dts files for hi3798cv200-poplar board
  dt-bindings: arm: hisilicon: add bindings for hi3798cv200 SoC and Poplar board
  ...
parents 0ff4c01b 3c0e3abd

Documentation/devicetree/bindings/arm/amlogic.txt

+3 −0
Original line number Diff line number Diff line
@@ -43,8 +43,11 @@ Board compatible values: 
  - "wetek,hub" (Meson gxbb)

  - "wetek,play2" (Meson gxbb)

  - "amlogic,p212" (Meson gxl s905x)

  - "khadas,vim" (Meson gxl s905x)



  - "amlogic,p230" (Meson gxl s905d)

  - "amlogic,p231" (Meson gxl s905d)

  - "hwacom,amazetv" (Meson gxl s905x)

  - "amlogic,q200" (Meson gxm s912)

  - "amlogic,q201" (Meson gxm s912)

  - "nexbox,a95x" (Meson gxbb or Meson gxl s905x)

Documentation/devicetree/bindings/arm/cavium-thunder2.txt

0 → 100644
+8 −0
Original line number Diff line number Diff line 
Cavium ThunderX2 CN99XX platform tree bindings

----------------------------------------------



Boards with Cavium ThunderX2 CN99XX SoC shall have the root property:

  compatible = "cavium,thunderx2-cn9900", "brcm,vulcan-soc";



These SoC uses the "cavium,thunder2" core which will be compatible

with "brcm,vulcan".

Documentation/devicetree/bindings/arm/cpus.txt

+1 −0
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ nodes to be present and contain the properties described below. 
			    "brcm,brahma-b15"

			    "brcm,vulcan"

			    "cavium,thunder"

			    "cavium,thunder2"

			    "faraday,fa526"

			    "intel,sa110"

			    "intel,sa1100"

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/arm/hisilicon/hisilicon.txt

+8 −0
Original line number Diff line number Diff line
@@ -4,6 +4,14 @@ Hi3660 SoC 
Required root node properties:

	- compatible = "hisilicon,hi3660";



Hi3798cv200 SoC

Required root node properties:

	- compatible = "hisilicon,hi3798cv200";



Hi3798cv200 Poplar Board

Required root node properties:

	- compatible = "hisilicon,hi3798cv200-poplar", "hisilicon,hi3798cv200";



Hi4511 Board

Required root node properties:

	- compatible = "hisilicon,hi3620-hi4511";