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

Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC DT updates from Olof Johansson:
 "DT changes continue to be the bulk of our merge window contents.

  We continue to have a large set of changes across the board as new
  platforms and drivers are added.

  Some of the new platforms are:
   - Alphascale ASM9260
   - Marvell Armada 388
   - CSR Atlas7
   - TI Davinci DM816x
   - Hisilicon HiP01
   - ST STiH418

  There have also been some sweeping changes, including relicensing of
  DTS contents from GPL to GPLv2+/X11 so that the same files can be
  reused in other non-GPL projects more easily.  There's also been
  changes to the DT Makefile to make it a little less conflict-ridden
  and churny down the road"

* tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (330 commits)
  ARM: dts: Add PPMU node for exynos4412-trats2
  ARM: dts: Add PPMU node for exynos3250-monk and exynos3250-rinato
  ARM: dts: Add PPMU dt node for exynos4 and exynos4210
  ARM: dts: Add PPMU dt node for exynos3250
  ARM: dts: add mipi dsi device node for exynos4415
  ARM: dts: add fimd device node for exynos4415
  ARM: dts: Add syscon phandle to the video-phy node for Exynos4
  ARM: dts: Add sound nodes for exynos4412-trats2
  ARM: dts: Fix CLK_MOUT_CAMn parent clocks assignment for exynos4412-trats2
  ARM: dts: Fix CLK_UART_ISP_SCLK clock assignment in exynos4x12.dtsi
  ARM: dts: Add max77693 charger node for exynos4412-trats2
  ARM: dts: Switch max77686 regulators to GPIO control for exynos4412-trats2
  ARM: dts: Add suspend configuration for max77686 regulators for exynos4412-trats2
  ARM: dts: Add Maxim 77693 fuel gauge node for exynos4412-trats2
  ARM: dts: am57xx-beagle-x15: Fix USB2 mode
  ARM: dts: am57xx-beagle-x15: Add extcon nodes for USB
  ARM: dts: dra72-evm: Add extcon nodes for USB
  ARM: dts: dra7-evm: Add extcon nodes for USB
  ARM: dts: rockchip: move the hdmi ddc-i2c-bus property to the actual boards
  ARM: dts: rockchip: enable vops and hdmi output on rk3288-firefly and -evb
  ...
parents 878ba61a 880c0d14

Documentation/devicetree/bindings/arm/armada-38x.txt

+7 −0
Original line number Diff line number Diff line
@@ -15,6 +15,13 @@ Required root node property: 


compatible: must contain "marvell,armada385"



In addition, boards using the Marvell Armada 388 SoC shall have the

following property before the previous one:



Required root node property:



compatible: must contain "marvell,armada388"



Example:



compatible = "marvell,a385-rd", "marvell,armada385", "marvell,armada380";

Documentation/devicetree/bindings/arm/digicolor.txt

0 → 100644
+6 −0
Original line number Diff line number Diff line 
Conexant Digicolor Platforms Device Tree Bindings



Each device tree must specify which Conexant Digicolor SoC it uses.

Must be the following compatible string:



  cnxt,cx92755

Documentation/devicetree/bindings/arm/exynos/power_domain.txt

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ Optional Properties: 
		devices in this power domain. Maximum of 4 pairs (N = 0 to 3)

		are supported currently.



Node of a device using power domains must have a samsung,power-domain property

Node of a device using power domains must have a power-domains property

defined with a phandle to respective power domain.



Example:

Documentation/devicetree/bindings/arm/fsl.txt

+8 −0
Original line number Diff line number Diff line
@@ -124,3 +124,11 @@ Example: 
		compatible = "fsl,ls1021a-dcfg";

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

	};



Freescale LS2085A SoC Device Tree Bindings

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



LS2085A ARMv8 based Simulator model

Required root node properties:

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

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

+25 −0
Original line number Diff line number Diff line
@@ -9,6 +9,10 @@ HiP04 D01 Board 
Required root node properties:

	- compatible = "hisilicon,hip04-d01";



HiP01 ca9x2 Board

Required root node properties:

	- compatible = "hisilicon,hip01-ca9x2";





Hisilicon system controller
@@ -36,6 +40,27 @@ Example: 
		reboot-offset = <0x4>;

	};



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

Hisilicon HiP01 system controller



Required properties:

- compatible : "hisilicon,hip01-sysctrl"

- reg : Register address and size



The HiP01 system controller is mostly compatible with hisilicon

system controller,but it has some specific control registers for

HIP01 SoC family, such as slave core boot, and also some same

registers located at different offset.



Example:



	/* for hip01-ca9x2 */

	sysctrl: system-controller@10000000 {

		compatible = "hisilicon,hip01-sysctrl", "hisilicon,sysctrl";

		reg = <0x10000000 0x1000>;

		reboot-offset = <0x4>;

	};



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

Hisilicon CPU controller

CRA Git | Maintained and supported by SUSTech CRA and CCSE