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

Commit 9b6d351a 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 and DT-conversion-related changes for various ARM platforms.  Most
  of these are to enable various devices on various boards, etc, and not
  necessarily worth enumerating.

  New boards and systems continue to come in as new devicetree files
  that don't require corresponding C changes any more, which is
  indicating that the system is starting to work fairly well.

  A few things worth pointing out:

   * ST Ericsson ux500 platforms have made the major push to move over
     to fully support the platform with DT
   * Renesas platforms continue their conversion over from legacy
     platform devices to DT-based for hardware description"

* tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (327 commits)
  ARM: dts: SiRF: add pin group for USP0 with only RX or TX frame sync
  ARM: dts: SiRF: add lost usp1_uart_nostreamctrl pin group for atlas6
  ARM: dts: sirf: add lost minigpsrtc device node
  ARM: dts: sirf: add clock, frequence-voltage table for CPU0
  ARM: dts: sirf: add lost bus_width, clock and status for sdhci
  ARM: dts: sirf: add lost clocks for cphifbg
  ARM: dts: socfpga: add pl330 clock
  ARM: dts: socfpga: update L2 tag and data latency
  arm: sun7i: cubietruck: Enable the i2c controllers
  ARM: dts: add support for EXYNOS4412 based TINY4412 board
  ARM: dts: Add initial support for Arndale Octa board
  ARM: bcm2835: add USB controller to device tree
  ARM: dts: MSM8974: Add MMIO architected timer node
  ARM: dts: MSM8974: Add restart node
  ARM: dts: sun7i: external clock outputs
  ARM: dts: sun7i: Change 32768 Hz oscillator node name to clk@N style
  ARM: dts: sun7i: Add pin muxing options for clock outputs
  ARM: dts: sun7i: Add rtp controller node
  ARM: dts: sun5i: Add rtp controller node
  ARM: dts: sun4i: Add rtp controller node
  ...
parents dfd10e7a 310c8547

Documentation/devicetree/bindings/arm/arm-boards

+8 −0
Original line number Diff line number Diff line
@@ -14,6 +14,9 @@ Required nodes: 
- core-module: the root node to the Integrator platforms must have

  a core-module with regs and the compatible string

  "arm,core-module-integrator"

- external-bus-interface: the root node to the Integrator platforms

  must have an external bus interface with regs and the

  compatible-string "arm,external-bus-interface"



  Required properties for the core module:

  - regs: the location and size of the core module registers, one
@@ -48,6 +51,11 @@ Required nodes: 
		reg = <0x10000000 0x200>;

	};



	ebi@12000000 {

		compatible = "arm,external-bus-interface";

		reg = <0x12000000 0x100>;

	};



	syscon {

		compatible = "arm,integrator-ap-syscon";

		reg = <0x11000000 0x100>;

Documentation/devicetree/bindings/arm/atmel-aic.txt

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


Required properties:

- compatible: Should be "atmel,<chip>-aic"

  <chip> can be "at91rm9200" or "sama5d3"

- interrupt-controller: Identifies the node as an interrupt controller.

- interrupt-parent: For single AIC system, it is an empty property.

- #interrupt-cells: The number of cells to define the interrupts. It should be 3.

Documentation/devicetree/bindings/arm/atmel-at91.txt

+2 −1
Original line number Diff line number Diff line
@@ -58,7 +58,8 @@ Example: 
	};



RAMC SDRAM/DDR Controller required properties:

- compatible: Should be "atmel,at91sam9260-sdramc",

- compatible: Should be "atmel,at91rm9200-sdramc",

			"atmel,at91sam9260-sdramc",

			"atmel,at91sam9g45-ddramc",

- reg: Should contain registers location and length

  For at91sam9263 and at91sam9g45 you must specify 2 entries.

Documentation/devicetree/bindings/arm/moxart.txt

0 → 100644
+12 −0
Original line number Diff line number Diff line 
MOXA ART device tree bindings



Boards with the MOXA ART SoC shall have the following properties:



Required root node property:



compatible = "moxa,moxart";



Boards:



- UC-7112-LX: embedded computer

  compatible = "moxa,moxart-uc-7112-lx", "moxa,moxart"

Documentation/devicetree/bindings/arm/samsung/sysreg.txt

+6 −1
Original line number Diff line number Diff line 
SAMSUNG S5P/Exynos SoC series System Registers (SYSREG)



Properties:

 - name : should be 'sysreg';

 - compatible : should contain "samsung,<chip name>-sysreg", "syscon";

   For Exynos4 SoC series it should be "samsung,exynos4-sysreg", "syscon";

 - reg : offset and length of the register set.



Example:

	syscon@10010000 {

		compatible = "samsung,exynos4-sysreg", "syscon";

		reg = <0x10010000 0x400>;

	};