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

Commit 043248cd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM DT updates from Olof Johansson:
 "Device tree contents continue to be the largest branches we submit.
  This time around, some of the contents worth pointing out is:

  New SoC platforms:
   - Freescale i.MX 7Solo
   - Broadcom BCM23550
   - Cirrus Logic EP7209 and EP7211 (clps711x platforms)_
   - Hisilicon HI3519
   - Renesas R8A7792

  Some of the other delta that is sticking out, line-count wise:
   - Exynos moves of IP blocks under an SoC bus, which causes a large
     delta due to indentation changes
   - a new Tegra K1 board: Apalis
   - a bunch of small updates to many Allwinner platforms; new hardware
     support, some cleanup, etc"

* tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (426 commits)
  ARM: dts: sun8i: Add dts file for inet86dz board
  ARM: dts: sun8i: Add dts file for Polaroid MID2407PXE03 tablet
  ARM: dts: sun8i: Use sun8i-reference-design-tablet for ga10h dts
  ARM: dts: sun8i: Use sun8i-reference-design-tablet for polaroid mid2809pxe04
  ARM: dts: sun8i: reference-design-tablet: Add drivevbus-supply
  ARM: dts: Copy sun8i-q8-common.dtsi sun8i-reference-design-tablet.dtsi
  ARM: dts: sun5i: Use sun5i-reference-design-tablet.dtsi for utoo p66 dts
  ARM: dts: sun5i: Use sun5i-reference-design-tablet.dtsi for dit4350 dts
  ARM: dts: sun5i: reference-design-tablet: Remove mention of q8
  ARM: dts: sun5i: reference-design-tablet: Set lradc vref to avcc
  ARM: dts: sun5i: Rename sun5i-q8-common.dtsi sun5i-reference-design-tablet.dtsi
  ARM: dts: sun5i: Move q8 display bits to sun5i-a13-q8-tablet.dts
  ARM: dts: sunxi: Rename sunxi-q8-common.dtsi sunxi-reference-design-tablet.dtsi
  ARM: dts: at91: Don't build unnecessary dtbs
  ARM: dts: at91: sama5d3x: separate motherboard gmac and emac definitions
  ARM: dts: at91: at91sam9g25ek: fix isi endpoint node
  ARM: dts: at91: move isi definition to at91sam9g25ek
  ARM: dts: at91: fix i2c-gpio node name
  ARM: dts: at91: vinco: fix regulator name
  ARM: dts: at91: ariag25 : fix onewire node
  ...
parents 43a0a98a d95eabc7

Documentation/devicetree/bindings/arm/bcm/brcm,bcm11351-cpu-method.txt

+3 −3
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ CPUs in the following Broadcom SoCs: 
  BCM11130, BCM11140, BCM11351, BCM28145, BCM28155, BCM21664



The enable method is specified by defining the following required

properties in the "cpus" device tree node:

properties in the "cpu" device tree node:

  - enable-method = "brcm,bcm11351-cpu-method";

  - secondary-boot-reg = <...>;
@@ -19,8 +19,6 @@ Example: 
	cpus {

		#address-cells = <1>;

		#size-cells = <0>;

		enable-method = "brcm,bcm11351-cpu-method";

		secondary-boot-reg = <0x3500417c>;



		cpu0: cpu@0 {

			device_type = "cpu";
@@ -32,5 +30,7 @@ Example: 
			device_type = "cpu";

			compatible = "arm,cortex-a9";

			reg = <1>;

			enable-method = "brcm,bcm11351-cpu-method";

			secondary-boot-reg = <0x3500417c>;

		};

	};

Documentation/devicetree/bindings/arm/bcm/brcm,bcm23550-cpu-method.txt

0 → 100644
+36 −0
Original line number Diff line number Diff line 
Broadcom Kona Family CPU Enable Method

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

This binding defines the enable method used for starting secondary

CPUs in the following Broadcom SoCs:

  BCM23550



The enable method is specified by defining the following required

properties in the "cpu" device tree node:

  - enable-method = "brcm,bcm23550";

  - secondary-boot-reg = <...>;



The secondary-boot-reg property is a u32 value that specifies the

physical address of the register used to request the ROM holding pen

code release a secondary CPU.  The value written to the register is

formed by encoding the target CPU id into the low bits of the

physical start address it should jump to.



Example:

	cpus {

		#address-cells = <1>;

		#size-cells = <0>;



		cpu0: cpu@0 {

			device_type = "cpu";

			compatible = "arm,cortex-a9";

			reg = <0>;

		};



		cpu1: cpu@1 {

			device_type = "cpu";

			compatible = "arm,cortex-a9";

			reg = <1>;

			enable-method = "brcm,bcm23550";

			secondary-boot-reg = <0x3500417c>;

		};

	};

Documentation/devicetree/bindings/arm/bcm/brcm,bcm23550.txt

0 → 100644
+15 −0
Original line number Diff line number Diff line 
Broadcom BCM23550 device tree bindings

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



This document describes the device tree bindings for boards with the BCM23550

SoC.



Required root node property:

  - compatible: brcm,bcm23550



Example:

	/ {

		model = "BCM23550 SoC";

		compatible = "brcm,bcm23550";

		[...]

	}

Documentation/devicetree/bindings/arm/cpus.txt

+3 −0
Original line number Diff line number Diff line
@@ -193,6 +193,8 @@ nodes to be present and contain the properties described below. 
			    "allwinner,sun6i-a31"

			    "allwinner,sun8i-a23"

			    "arm,realview-smp"

			    "brcm,bcm11351-cpu-method"

			    "brcm,bcm23550"

			    "brcm,bcm-nsp-smp"

			    "brcm,brahma-b15"

			    "marvell,armada-375-smp"
@@ -204,6 +206,7 @@ nodes to be present and contain the properties described below. 
			    "qcom,gcc-msm8660"

			    "qcom,kpss-acc-v1"

			    "qcom,kpss-acc-v2"

			    "renesas,apmu"

			    "rockchip,rk3036-smp"

			    "rockchip,rk3066-smp"

			    "ste,dbx500-smp"

Documentation/devicetree/bindings/arm/hisilicon/hi3519-sysctrl.txt

0 → 100644
+14 −0
Original line number Diff line number Diff line 
* Hisilicon Hi3519 System Controller Block



This bindings use the following binding:

Documentation/devicetree/bindings/mfd/syscon.txt



Required properties:

- compatible: "hisilicon,hi3519-sysctrl".

- reg: the register region of this block



Examples:

sysctrl: system-controller@12010000 {

	compatible = "hisilicon,hi3519-sysctrl", "syscon";

	reg = <0x12010000 0x1000>;

};