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

Commit c61c15e0 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:
 "ARM64 DT updates are fairly small this time, only two new SoCs and a
  handful of new machines get added, all of them similar to other
  hardware we already support.

  New SoC:

   - HiSilicon Kirin960/Hi3660 and HiKey960 development board

   - NXP LS1012a with three reference boards:
        http://www.nxp.com/products/microcontrollers-and-processors/arm-processors/qoriq-layerscape-arm-processors/qoriq-layerscape-1012a-low-power-communication-processor:LS1012A

  New development board:

   - Banana Pi M64, based on Allwinner A64:
        http://www.banana-pi.org/m64.html

   - SolidRun MACCHIATOBin based on Marvell Armada 8K:
        https://www.solid-run.com/marvell-armada-family/armada-8040-community-board/

   - Broadcom BCM958712DxXMC NorthStar2 reference board (another one)

  A lot of platforms improve support for existing machines by adding
  extra devices for which a binding and driver is availabe:

  Allwinner:
   - MMC, USB

  ARM Juno:
   - Coresight, STM

  Broadcom:
   - NS2 GICv2m irqchip and PCIe

  Marvell:
   - Armada 3700 SPI, I2C, ethernet switch

  Mediatek:
   - MT8173 thermal

  NXP i.MX:
   - LS1046A thermal

  Qualcomm:
   - coresight on MSM8916, HDMI, WCNSS, SCM

  Renesas:
   - r8a779[56] thermal, powerdomain, ethernet, sound, pwm, can, can fd

  Rockchip:
   - thermal, eDP, pinctrl enhancements

  Samsung:
   - TM2 touchkey, Exynos5433 HDMI and power management improvements

  UniPhier:
   - SD reset, eMMC controller

  ZTE:
   - oppv2 cpufreq"

* tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (110 commits)
  arm64: dts: qcom: Add msm8916 CoreSight components
  arm64: dts: marvell: adjust name of sd-mmc-gop clock in syscon
  arm64: allwinner: add BananaPi-M64 support
  arm64: allwinner: a64: add UART1 pin nodes
  arm64: allwinner: pine64: add MMC support
  arm64: allwinner: a64: Increase the MMC max frequency
  arm64: allwinner: a64: Add MMC pinctrl nodes
  arm64: allwinner: a64: Add MMC nodes
  dt-bindings: clockgen: Add compatible string for LS1012A
  Documentation: DT: add LS1012A compatible for SCFG and DCFG
  Documentation: DT: Add entry for FSL LS1012A RDB, FRDM, QDS boards
  arm64: dts: marvell: add generic-ahci compatibles for CP110 ahci
  arm64: tegra: Use symbolic reset identifiers
  arm64: dts: r8a7796: Mark EthernetAVB device node disabled
  arm64: dts: r8a7795: Mark EthernetAVB device node disabled
  arm64: dts: r8a7795: tidyup audma definition order
  arm64: dts: r8a7796: Link ARM GIC to clock and clock domain
  arm64: dts: r8a7795: Link ARM GIC to clock and clock domain
  arm64: dts: r8a7796: Add R-Car Gen3 thermal support
  arm64: dts: r8a7795: Add R-Car Gen3 thermal support
  ...
parents 195849ea cbab3197

Documentation/devicetree/bindings/arm/cpus.txt

+1 −0
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ nodes to be present and contain the properties described below. 
			    "arm,cortex-a53"

			    "arm,cortex-a57"

			    "arm,cortex-a72"

			    "arm,cortex-a73"

			    "arm,cortex-m0"

			    "arm,cortex-m0+"

			    "arm,cortex-m1"

Documentation/devicetree/bindings/arm/fsl.txt

+18 −2
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ status. 
  - 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.

	ls1012a, ls1021a, ls1043a, ls1046a, ls2080a.



  - reg: should contain base address and length of SCFG memory-mapped registers
@@ -126,7 +126,7 @@ core start address and release the secondary core from holdoff and startup. 
  - 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.

	ls1012a, ls1021a, ls1043a, ls1046a, ls2080a.



  - reg : should contain base address and length of DCFG memory-mapped registers
@@ -139,6 +139,22 @@ Example: 
Freescale ARMv8 based Layerscape SoC family Device Tree Bindings

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



LS1012A SoC

Required root node properties:

    - compatible = "fsl,ls1012a";



LS1012A ARMv8 based RDB Board

Required root node properties:

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



LS1012A ARMv8 based FRDM Board

Required root node properties:

    - compatible = "fsl,ls1012a-frdm", "fsl,ls1012a";



LS1012A ARMv8 based QDS Board

Required root node properties:

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



LS1043A SoC

Required root node properties:

    - compatible = "fsl,ls1043a";

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

+4 −0
Original line number Diff line number Diff line 
Hisilicon Platforms Device Tree Bindings

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

Hi3660 SoC

Required root node properties:

	- compatible = "hisilicon,hi3660";



Hi4511 Board

Required root node properties:

	- compatible = "hisilicon,hi3620-hi4511";

Documentation/devicetree/bindings/arm/shmobile.txt

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ Boards: 
    compatible = "renesas,rskrza1", "renesas,r7s72100"

  - Salvator-X (RTP0RC7795SIPB0010S)

    compatible = "renesas,salvator-x", "renesas,r8a7795";

  - Salvator-X

  - Salvator-X (RTP0RC7796SIPB0011S)

    compatible = "renesas,salvator-x", "renesas,r8a7796";

  - SILK (RTP0RC7794LCB00011S)

    compatible = "renesas,silk", "renesas,r8a7794"

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

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

	* "fsl,b4420-clockgen"

	* "fsl,b4860-clockgen"

	* "fsl,ls1012a-clockgen"

	* "fsl,ls1021a-clockgen"

	* "fsl,ls1043a-clockgen"

	* "fsl,ls1046a-clockgen"