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

Commit 482c3e88 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 Arnd Bergmann:
 "A couple of interesting new SoC platforms are now supported, these are
  the respective DTS sources:

   - Samsung Exynos5433 mobile phone platform, including an (almost)
     fully supported phone reference board.
   - Hisilicon Hip07 server platform and D05 board, the latest iteration
     of their product line, now with 64 Cortex-A72 cores across two
     sockets.
   - Allwinner A64 SoC, the first 64-bit chip from their "sunxi" product
     line, used in Android tablets and ultra-cheap development boards
   - NXP LS1046A Communication processor, improving on the earlier
     LS1043A with faster CPU cores
   - Qualcomm MSM8992 (Snapdragon 808) and MSM8994 (Snapdragon 810)
     mobile phone SoCs
   - Early support for the Nvidia Tegra Tegra186 SoC
   - Amlogic S905D is a minor variant of their existing Android consumer
     product line
   - Rockchip PX5 automotive platform, a close relative of their popular
     rk3368 Android tablet chips

  Aside from the respective evaluation platforms for the above chips,
  there are only a few consumer devices and boards added this time:

   - Huawei Nexus 6P (Angler) mobile phone
   - LG Nexus 5x (Bullhead) mobile phone
   - Nexbox A1 and A95X Android TV boxes
   - Pine64 development board based on Allwinner A64
   - Globalscale Marvell ESPRESSOBin community board based on Armada 3700
   - Renesas "R-Car Starter Kit Pro" (M3ULCB) low-cost automotive board

  For the existing platforms, we get bug fixes and new peripheral
  support for Juno, Renesas, Uniphier, Amlogic, Samsung, Broadcom,
  Rockchip, Berlin, and ZTE"

* tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (168 commits)
  arm64: dts: fix build errors from missing dependencies
  ARM64: dts: meson-gxbb: add SCPI pre-1.0 compatible
  ARM64: dts: meson-gxl: Add support for Nexbox A95X
  ARM64: dts: meson-gxm: Add support for the Nexbox A1
  ARM: dts: artpec: add pcie support
  arm64: dts: berlin4ct-dmp: add missing unit name to /memory node
  arm64: dts: berlin4ct-stb: add missing unit name to /memory node
  arm64: dts: berlin4ct: add missing unit name to /soc node
  arm64: dts: qcom: msm8916: Add ddr support to sdhc1
  arm64: dts: exynos: Enable HS400 mode for eMMC for TM2
  ARM: dts: Add xo to sdhc clock node on qcom platforms
  ARM64: dts: Add support for Meson GXM
  dt-bindings: add rockchip RK1108 Evaluation board
  arm64: dts: NS2: Add PCI PHYs
  arm64: dts: NS2: enable sdio1
  arm64: dts: exynos: Add the mshc_2 node for supporting T-Flash
  arm64: tegra: Add NVIDIA P2771 board support
  arm64: tegra: Enable PSCI on P3310
  arm64: tegra: Add NVIDIA P3310 processor module support
  arm64: tegra: Add GPIO controllers on Tegra186
  ...
parents 786a72d7 09a56651

Documentation/devicetree/bindings/arm/amlogic.txt

+19 −0
Original line number Diff line number Diff line
@@ -17,6 +17,18 @@ Boards with the Amlogic Meson GXBaby SoC shall have the following properties: 
  Required root node property:

    compatible: "amlogic,meson-gxbb";



Boards with the Amlogic Meson GXL S905X SoC shall have the following properties:

  Required root node property:

    compatible: "amlogic,s905x", "amlogic,meson-gxl";



Boards with the Amlogic Meson GXL S905D SoC shall have the following properties:

  Required root node property:

    compatible: "amlogic,s905d", "amlogic,meson-gxl";



Boards with the Amlogic Meson GXM S912 SoC shall have the following properties:

  Required root node property:

    compatible: "amlogic,s912", "amlogic,meson-gxm";



Board compatible values:

  - "geniatech,atv1200" (Meson6)

  - "minix,neo-x8" (Meson8)
@@ -28,3 +40,10 @@ Board compatible values: 
  - "hardkernel,odroid-c2" (Meson gxbb)

  - "amlogic,p200" (Meson gxbb)

  - "amlogic,p201" (Meson gxbb)

  - "amlogic,p212" (Meson gxl s905x)

  - "amlogic,p230" (Meson gxl s905d)

  - "amlogic,p231" (Meson gxl s905d)

  - "amlogic,q200" (Meson gxm s912)

  - "amlogic,q201" (Meson gxm s912)

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

  - "nexbox,a1" (Meson gxm s912)

Documentation/devicetree/bindings/arm/fsl.txt

+31 −3
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ Freescale LS1021A Platform Device Tree Bindings 
Required root node compatible properties:

  - compatible = "fsl,ls1021a";



Freescale LS1021A SoC-specific Device Tree Bindings

Freescale SoC-specific Device Tree Bindings

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



Freescale SCFG
@@ -105,7 +105,11 @@ Freescale SCFG 
configuration and status registers for the chip. Such as getting PEX port

status.

  Required properties:

  - compatible: should be "fsl,ls1021a-scfg"

  - compatible: Should contain a chip-specific compatible string,

	Chip-specific strings are of the form "fsl,<chip>-scfg",

	The following <chip>s are known to be supported:

	ls1021a, ls1043a, ls1046a, ls2080a.



  - reg: should contain base address and length of SCFG memory-mapped registers



Example:
@@ -119,7 +123,11 @@ Freescale DCFG 
configuration and status for the device. Such as setting the secondary

core start address and release the secondary core from holdoff and startup.

  Required properties:

  - compatible: should be "fsl,ls1021a-dcfg"

  - compatible: Should contain a chip-specific compatible string,

	Chip-specific strings are of the form "fsl,<chip>-dcfg",

	The following <chip>s are known to be supported:

	ls1021a, ls1043a, ls1046a, ls2080a.



  - reg : should contain base address and length of DCFG memory-mapped registers



Example:
@@ -131,6 +139,10 @@ Example: 
Freescale ARMv8 based Layerscape SoC family Device Tree Bindings

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



LS1043A SoC

Required root node properties:

    - compatible = "fsl,ls1043a";



LS1043A ARMv8 based RDB Board

Required root node properties:

    - compatible = "fsl,ls1043a-rdb", "fsl,ls1043a";
@@ -139,6 +151,22 @@ LS1043A ARMv8 based QDS Board 
Required root node properties:

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



LS1046A SoC

Required root node properties:

    - compatible = "fsl,ls1046a";



LS1046A ARMv8 based QDS Board

Required root node properties:

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



LS1046A ARMv8 based RDB Board

Required root node properties:

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



LS2080A SoC

Required root node properties:

    - compatible = "fsl,ls2080a";



LS2080A ARMv8 based Simulator model

Required root node properties:

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

Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt

+4 −0
Original line number Diff line number Diff line
@@ -28,6 +28,10 @@ HiP06 D03 Board 
Required root node properties:

	- compatible = "hisilicon,hip06-d03";



HiP07 D05 Board

Required root node properties:

	- compatible = "hisilicon,hip07-d05";



Hisilicon system controller



Required properties:

Documentation/devicetree/bindings/arm/qcom.txt

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ The 'SoC' element must be one of the following strings: 
	apq8096

	msm8916

	msm8974

	msm8992

	msm8994

	msm8996

	mdm9615