Commit 6d1c2448 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:
 "As usual, the bulk of this release is again DT file contents.

  There's a huge number of changes here, and it's challenging to give a
  crisp overview of just what is in here.  To start with:

  New boards:

   - TI-based DM3730 from LogicPD (Torpedo)
   - Cosmic+ M4 (nommu) initial support (Freescale Vybrid)
   - Raspberry Pi 2 DT files
   - Watchdog on Meson8b
   - Veyron-mickey (ASUS Chromebit) DTS
   - Rockchip rk3228 SoC and eval board
   - Sigma Designs Tango4

  Improvements:

   - Improved support for Qualcomm APQ8084, including Sony Xperia Z DT files
   - Misc new devices for Rockchip rk3036 and rk3288
   - Allwinner updates for misc SoCs and systems

  ... and a _large_ number of other changes across the field.  Devices
  added to SoC DTSI and board DTS files for a number of SoC vendors, new
  product boards on already-supported SoCs, cleanups and refactorings of
  existing DTS/DTSI files and a bunch of other changes"

* tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (469 commits)
  ARM: dts: compulab: add new board description
  ARM: versatile: add the syscon LEDs to the DT
  dts: vt8500: Fix errors in SDHC node for WM8505
  ARM: dts: imx6q: clean up unused ipu2grp
  ARM: dts: silk: Add compatible property to "partitions" node
  ARM: dts: gose: Add compatible property to "partitions" node
  ARM: dts: porter: Add compatible property to "partitions" node
  ARM: dts: koelsch: Add compatible property to "partitions" node
  ARM: dts: lager: Add compatible property to "partitions" node
  ARM: dts: bockw: Add compatible property to "partitions" node
  ARM: dts: meson8b: Add watchdog node
  Documentation: watchdog: Add new bindings for meson8b
  ARM: meson: Add status LED for Odroid-C1
  ARM: dts: uniphier: fix a typo in comment block
  ARM: bcm2835: Add the auxiliary clocks to the device tree.
  ARM: bcm2835: Add devicetree for bcm2836 and Raspberry Pi 2 B
  ARM: bcm2835: Move the CPU/peripheral include out of common RPi DT.
  ARM: bcm2835: Split the DT for peripherals from the DT for the CPU
  ARM: realview: set up cache correctly on the PB11MPCore
  ARM: dts: Unify G2D device node with other devices on exynos4
  ...
parents 1305eda7 4dd041b6

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

+7 −0
Original line number Diff line number Diff line
@@ -5,4 +5,11 @@ Boards with the BCM4708 SoC shall have the following properties: 


Required root node property:



bcm4708

compatible = "brcm,bcm4708";



bcm4709

compatible = "brcm,bcm4709";



bcm53012

compatible = "brcm,bcm53012";

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

0 → 100644
+39 −0
Original line number Diff line number Diff line 
Broadcom Northstar Plus SoC CPU Enable Method

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

This binding defines the enable method used for starting secondary

CPU in the following Broadcom SoCs:

  BCM58522, BCM58525, BCM58535, BCM58622, BCM58623, BCM58625, BCM88312



The enable method is specified by defining the following required

properties in the corresponding secondary "cpu" device tree node:

  - enable-method = "brcm,bcm-nsp-smp";

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



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

physical address of the register which should hold the common

entry point for a secondary CPU. This entry is cpu node specific

and should be added per cpu. E.g., in case of NSP (BCM58625) which

is a dual core CPU SoC, this entry should be added to cpu1 node.





Example:

	cpus {

		#address-cells = <1>;

		#size-cells = <0>;



		cpu0: cpu@0 {

			device_type = "cpu";

			compatible = "arm,cortex-a9";

			next-level-cache = <&L2>;

			reg = <0>;

		};



		cpu1: cpu@1 {

			device_type = "cpu";

			compatible = "arm,cortex-a9";

			next-level-cache = <&L2>;

			enable-method = "brcm,bcm-nsp-smp";

			secondary-boot-reg = <0xffff042c>;

			reg = <1>;

		};

	};

Documentation/devicetree/bindings/arm/compulab-boards.txt

0 → 100644
+25 −0
Original line number Diff line number Diff line 
CompuLab SB-SOM is a multi-module baseboard capable of carrying:

 - CM-T43

 - CM-T54

 - CM-QS600

 - CL-SOM-AM57x

 - CL-SOM-iMX7

modules with minor modifications to the SB-SOM assembly.



Required root node properties:

    - compatible = should be "compulab,sb-som"



Compulab CL-SOM-iMX7 is a miniature System-on-Module (SoM) based on

Freescale i.MX7 ARM Cortex-A7 System-on-Chip.



Required root node properties:

    - compatible = "compulab,cl-som-imx7", "fsl,imx7d";



Compulab SBC-iMX7 is a single board computer based on the

Freescale i.MX7 system-on-chip. SBC-iMX7 is implemented with

the CL-SOM-iMX7 System-on-Module providing most of the functions,

and SB-SOM-iMX7 carrier board providing additional peripheral

functions and connectors.



Required root node properties:

    - compatible = "compulab,sbc-imx7", "compulab,cl-som-imx7", "fsl,imx7d";

Documentation/devicetree/bindings/arm/cpus.txt

+1 −0
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ nodes to be present and contain the properties described below. 
			    "allwinner,sun8i-a23"

			    "arm,psci"

			    "arm,realview-smp"

			    "brcm,bcm-nsp-smp"

			    "brcm,brahma-b15"

			    "marvell,armada-375-smp"

			    "marvell,armada-380-smp"

Documentation/devicetree/bindings/arm/marvell,kirkwood.txt

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ board. Currently known boards are: 
"buffalo,lswxl"

"buffalo,lsxhl"

"buffalo,lsxl"

"cloudengines,pogo02"

"cloudengines,pogoplugv4"

"dlink,dns-320"

"dlink,dns-320-a1"

"dlink,dns-325"

CRA Git | Maintained and supported by SUSTech CRA and CCSE