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

Commit f9efbce6 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:
 "Most of this branch consists of updates, additions and general churn
  of the device tree source files in the kernel (arch/arm/boot/dts).
  Besides that, there are a few things to point out:

   - Lots of platform conversion on OMAP2+, with removal of old board
     files for various platforms.
   - Final conversion of a bunch of ux500 (ST-Ericsson) platforms as
     well
   - Some updates to pinctrl and other subsystems.  Most of these are
     for DT-enablement of the various platforms and acks have been
     collected"

* tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (385 commits)
  ARM: dts: bcm11351: Use GIC/IRQ defines for sdio interrupts
  ARM: dts: bcm: Add missing UARTs for bcm11351 (bcm281xx)
  ARM: dts: bcm281xx: Add card detect GPIO
  ARM: dts: rename ARCH_BCM to ARCH_BCM_MOBILE (dt)
  ARM: bcm281xx: Add device node for the GPIO controller
  ARM: mvebu: Add Netgear ReadyNAS 104 board
  ARM: tegra: fix Tegra114 IOMMU register address
  ARM: kirkwood: add support for OpenBlocks A7 platform
  ARM: dts: omap4-panda: add DPI pinmuxing
  ARM: dts: AM33xx: Add RNG node
  ARM: dts: AM33XX: Add hwspinlock node
  ARM: dts: OMAP5: Add hwspinlock node
  ARM: dts: OMAP4: Add hwspinlock node
  ARM: dts: use 'status' property for PCIe nodes
  ARM: dts: sirf: add missed address-cells and size-cells for prima2 I2C
  ARM: dts: sirf: add missed cell, cs and dma channel for SPI nodes
  ARM: dts: sirf: add missed graphics2d iobg in atlas6 dts
  ARM: dts: sirf: add missed chhifbg node in prima2 and atlas6 dts
  ARM: dts: sirf: add missed memcontrol-monitor node in prima2 and atlas6 dts
  ARM: mvebu: Add the core-divider clock to Armada 370/XP
  ...
parents 53575aa9 07eb663b

Documentation/devicetree/bindings/arm/omap/omap.txt

+2 −1
Original line number Diff line number Diff line
@@ -21,7 +21,8 @@ Required properties: 
Optional properties:

- ti,no_idle_on_suspend: When present, it prevents the PM to idle the module

  during suspend.



- ti,no-reset-on-init: When present, the module should not be reset at init

- ti,no-idle-on-init: When present, the module should not be idled at init



Example:

Documentation/devicetree/bindings/arm/vic.txt

+12 −0
Original line number Diff line number Diff line
@@ -18,6 +18,15 @@ Required properties: 
Optional properties:



- interrupts : Interrupt source for parent controllers if the VIC is nested.

- valid-mask : A one cell big bit mask of valid interrupt sources. Each bit

  represents single interrupt source, starting from source 0 at LSb and ending

  at source 31 at MSb. A bit that is set means that the source is wired and

  clear means otherwise. If unspecified, defaults to all valid.

- valid-wakeup-mask : A one cell big bit mask of interrupt sources that can be

  configured as wake up source for the system. Order of bits is the same as for

  valid-mask property. A set bit means that this interrupt source can be

  configured as a wake up source for the system. If unspecied, defaults to all

  interrupt sources configurable as wake up sources.



Example:
@@ -26,4 +35,7 @@ Example: 
		interrupt-controller;

		#interrupt-cells = <1>;

		reg = <0x60000 0x1000>;



		valid-mask = <0xffffff7f>;

		valid-wakeup-mask = <0x0000ff7f>;

	};

Documentation/devicetree/bindings/clock/mvebu-corediv-clock.txt

0 → 100644
+19 −0
Original line number Diff line number Diff line 
* Core Divider Clock bindings for Marvell MVEBU SoCs



The following is a list of provided IDs and clock names on Armada 370/XP:

 0 = nand (NAND clock)



Required properties:

- compatible : must be "marvell,armada-370-corediv-clock"

- reg : must be the register address of Core Divider control register

- #clock-cells : from common clock binding; shall be set to 1

- clocks : must be set to the parent's phandle



Example:



corediv_clk: corediv-clocks@18740 {

	compatible = "marvell,armada-370-corediv-clock";

	reg = <0x18740 0xc>;

	#clock-cells = <1>;

	clocks = <&pll>;

};

Documentation/devicetree/bindings/crypto/omap-aes.txt

0 → 100644
+31 −0
Original line number Diff line number Diff line 
OMAP SoC AES crypto Module



Required properties:



- compatible : Should contain entries for this and backward compatible

  AES versions:

  - "ti,omap2-aes" for OMAP2.

  - "ti,omap3-aes" for OMAP3.

  - "ti,omap4-aes" for OMAP4 and AM33XX.

  Note that the OMAP2 and 3 versions are compatible (OMAP3 supports

  more algorithms) but they are incompatible with OMAP4.

- ti,hwmods: Name of the hwmod associated with the AES module

- reg : Offset and length of the register set for the module

- interrupts : the interrupt-specifier for the AES module.



Optional properties:

- dmas: DMA specifiers for tx and rx dma. See the DMA client binding,

	Documentation/devicetree/bindings/dma/dma.txt

- dma-names: DMA request names should include "tx" and "rx" if present.



Example:

	/* AM335x */

	aes: aes@53500000 {

		compatible = "ti,omap4-aes";

		ti,hwmods = "aes";

		reg = <0x53500000 0xa0>;

		interrupts = <102>;

		dmas = <&edma 6>,

		       <&edma 5>;

		dma-names = "tx", "rx";

	};

Documentation/devicetree/bindings/crypto/omap-sham.txt

0 → 100644
+28 −0
Original line number Diff line number Diff line 
OMAP SoC SHA crypto Module



Required properties:



- compatible : Should contain entries for this and backward compatible

  SHAM versions:

  - "ti,omap2-sham" for OMAP2 & OMAP3.

  - "ti,omap4-sham" for OMAP4 and AM33XX.

  Note that these two versions are incompatible.

- ti,hwmods: Name of the hwmod associated with the SHAM module

- reg : Offset and length of the register set for the module

- interrupts : the interrupt-specifier for the SHAM module.



Optional properties:

- dmas: DMA specifiers for the rx dma. See the DMA client binding,

	Documentation/devicetree/bindings/dma/dma.txt

- dma-names: DMA request name. Should be "rx" if a dma is present.



Example:

	/* AM335x */

	sham: sham@53100000 {

		compatible = "ti,omap4-sham";

		ti,hwmods = "sham";

		reg = <0x53100000 0x200>;

		interrupts = <109>;

		dmas = <&edma 36>;

		dma-names = "rx";

	};