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

Commit 4f2d658b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull arm-soc device tree description updates from Arnd Bergmann:
 "This branch contains two kinds of updates: Some platforms in the
  process of getting converted to device tree based booting, and the
  platform specific patches necessary for that are included here.

  Other platforms are already converted, so we just need to update the
  actual device tree source files and the binding documents to add
  support for new board and new drivers.

  In the future we will probably separate those into two branches, and
  in the long run, the plan is to move the device tree source files out
  of the kernel repository, but that has to wait until we have completed
  a much larger portion of the binding documents."

Fix up trivial conflicts in arch/arm/mach-imx/clk-imx6q.c due to newly
added clkdev registers next to a few removed unnecessary ones.

* tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (119 commits)
  ARM: LPC32xx: Add PWM to base dts file
  ARM: EXYNOS: mark the DMA channel binding for SPI as preliminary
  ARM: dts: Add nodes for spi controllers for SAMSUNG EXYNOS5 platforms
  ARM: EXYNOS: Enable platform support for SPI controllers for EXYNOS5
  ARM: EXYNOS: Add spi clock support for EXYNOS5
  ARM: dts: Add nodes for spi controllers for SAMSUNG EXYNOS4 platforms
  ARM: EXYNOS: Enable platform support for SPI controllers for EXYNOX4
  ARM: EXYNOS: Fix the incorrect hierarchy of spi controller bus clock
  ARM: ux500: Remove PMU platform registration when booting with DT
  ARM: ux500: Remove temporary snowball_of_platform_devs enablement structure
  ARM: ux500: Ensure vendor specific properties have the vendor's identifier
  pinctrl: pinctrl-nomadik: Append sleepmode property with vendor specific prefixes
  ARM: ux500: Move rtc-pl031 registration to Device Tree when enabled
  ARM: ux500: Enable the AB8500 RTC for all DT:ed DB8500 based devices
  ARM: ux500: Correctly reference IRQs supplied by the AB8500 from Device Tree
  ARM: ux500: Apply ab8500-debug node do the db8500 DT structure
  ARM: ux500: Add a ab8500-usb Device Tree node for db8500 based devices
  ARM: ux500: Add db8500 Device Tree node for misc/ab8500-pwm
  ARM: ux500: Add db8500 Device Tree node for ab8500-sysctrl
  ARM: ux500: Enable LED heartbeat functionality on Snowbal via DT
  ...
parents e66d6371 1fc5f7d5

Documentation/devicetree/bindings/arm/davinci/cp-intc.txt

0 → 100644
+27 −0
Original line number Diff line number Diff line 
* TI Common Platform Interrupt Controller



Common Platform Interrupt Controller (cp_intc) is used on

OMAP-L1x SoCs and can support several configurable number

of interrupts.



Main node required properties:



- compatible : should be:

	"ti,cp-intc"

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

- #interrupt-cells : Specifies the number of cells needed to encode an

  interrupt source. The type shall be a <u32> and the value shall be 1.



  The cell contains the interrupt number in the range [0-128].

- ti,intc-size: Number of interrupts handled by the interrupt controller.

- reg: physical base address and size of the intc registers map.



Example:



	intc: interrupt-controller@1 {

		compatible = "ti,cp-intc";

		interrupt-controller;

		#interrupt-cells = <1>;

		ti,intc-size = <101>;

		reg = <0xfffee000 0x2000>;

	};

Documentation/devicetree/bindings/arm/olimex.txt

0 → 100644
+6 −0
Original line number Diff line number Diff line 
Olimex i.MX Platforms Device Tree Bindings

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



i.MX23 Olinuxino Low Cost Board

Required root node properties:

    - compatible = "olimex,imx23-olinuxino", "fsl,imx23";

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

+3 −0
Original line number Diff line number Diff line
@@ -47,3 +47,6 @@ Boards: 


- AM335X EVM : Software Developement Board for AM335x

  compatible = "ti,am335x-evm", "ti,am33xx", "ti,omap3"



- AM335X Bone : Low cost community board

  compatible = "ti,am335x-bone", "ti,am33xx", "ti,omap3"

Documentation/devicetree/bindings/fb/mxsfb.txt

0 → 100644
+19 −0
Original line number Diff line number Diff line 
* Freescale MXS LCD Interface (LCDIF)



Required properties:

- compatible: Should be "fsl,<chip>-lcdif".  Supported chips include

  imx23 and imx28.

- reg: Address and length of the register set for lcdif

- interrupts: Should contain lcdif interrupts



Optional properties:

- panel-enable-gpios : Should specify the gpio for panel enable



Examples:



lcdif@80030000 {

	compatible = "fsl,imx28-lcdif";

	reg = <0x80030000 2000>;

	interrupts = <38 86>;

	panel-enable-gpios = <&gpio3 30 0>;

};

Documentation/devicetree/bindings/gpio/fsl-imx-gpio.txt

+12 −2
Original line number Diff line number Diff line
@@ -8,8 +8,16 @@ Required properties: 
  by low 16 pins and the second one is for high 16 pins.

- gpio-controller : Marks the device node as a gpio controller.

- #gpio-cells : Should be two.  The first cell is the pin number and

  the second cell is used to specify optional parameters (currently

  unused).

  the second cell is used to specify the gpio polarity:

      0 = active high

      1 = active low

- interrupt-controller: Marks the device node as an interrupt controller.

- #interrupt-cells : Should be 2.  The first cell is the GPIO number.

  The second cell bits[3:0] is used to specify trigger type and level flags:

      1 = low-to-high edge triggered.

      2 = high-to-low edge triggered.

      4 = active high level-sensitive.

      8 = active low level-sensitive.



Example:
@@ -19,4 +27,6 @@ gpio0: gpio@73f84000 { 
	interrupts = <50 51>;

	gpio-controller;

	#gpio-cells = <2>;

	interrupt-controller;

	#interrupt-cells = <2>;

};