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

Commit d05663a2 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'for_3.10/dts' of... 

Merge branch 'for_3.10/dts' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into omap-for-v3.10/dt
parents 07961ac7 1fac4fff

Documentation/devicetree/bindings/arm/omap/l3-noc.txt

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ provided by Arteris. 
Required properties:

- compatible : Should be "ti,omap3-l3-smx" for OMAP3 family

               Should be "ti,omap4-l3-noc" for OMAP4 family

- reg:	Contains L3 register address range for each noc domain.

- ti,hwmods: "l3_main_1", ... One hwmod for each noc domain.



Examples:

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

+15 −2
Original line number Diff line number Diff line 
OMAP Timer bindings



Required properties:

- compatible:		Must be "ti,omap2-timer" for OMAP2+ controllers.

- compatible:		Should be set to one of the below. Please note that

			OMAP44xx devices have timer instances that are 100%

			register compatible with OMAP3xxx devices as well as

			newer timers that are not 100% register compatible.

			So for OMAP44xx devices timer instances may use

			different compatible strings.



			ti,omap2420-timer (applicable to OMAP24xx devices)

			ti,omap3430-timer (applicable to OMAP3xxx/44xx devices)

			ti,omap4430-timer (applicable to OMAP44xx devices)

			ti,omap5430-timer (applicable to OMAP543x devices)

			ti,am335x-timer	(applicable to AM335x devices)

			ti,am335x-timer-1ms (applicable to AM335x devices)



- reg:			Contains timer register address range (base address and

			length).

- interrupts: 		Contains the interrupt information for the timer. The
@@ -22,7 +35,7 @@ Optional properties: 
Example:



timer12: timer@48304000 {

	compatible = "ti,omap2-timer";

	compatible = "ti,omap3430-timer";

	reg = <0x48304000 0x400>;

	interrupts = <95>;

	ti,hwmods = "timer12"

Documentation/devicetree/bindings/gpio/gpio-omap.txt

+4 −4
Original line number Diff line number Diff line
@@ -5,12 +5,12 @@ Required properties: 
  - "ti,omap2-gpio" for OMAP2 controllers

  - "ti,omap3-gpio" for OMAP3 controllers

  - "ti,omap4-gpio" for OMAP4 controllers

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

- #gpio-cells : Should be two.

  - first cell is the pin number

  - second cell is used to specify optional parameters (unused)

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

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

- #interrupt-cells : Should be 2.

- interrupt-controller: Mark the device node as an interrupt controller

  The first cell is the GPIO number.

  The second cell is used to specify flags:

    bits[3:0] trigger type and level flags:
@@ -29,8 +29,8 @@ Example: 
gpio4: gpio4 {

    compatible = "ti,omap4-gpio";

    ti,hwmods = "gpio4";

    #gpio-cells = <2>;

    gpio-controller;

    #interrupt-cells = <2>;

    #gpio-cells = <2>;

    interrupt-controller;

    #interrupt-cells = <2>;

};

Documentation/devicetree/bindings/usb/omap-usb.txt

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ OMAP MUSB GLUE 
   represents PERIPHERAL.

 - power : Should be "50". This signifies the controller can supply upto

   100mA when operating in host mode.

 - usb-phy : the phandle for the PHY device



Optional properties:

 - ctrl-module : phandle of the control module this glue uses to write to

arch/arm/boot/dts/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -115,10 +115,14 @@ dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \ 
	imx28-tx28.dtb

dtb-$(CONFIG_ARCH_NOMADIK) += ste-nomadik-s8815.dtb

dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \

	omap3430-sdp.dtb \

	omap3-beagle.dtb \

	omap3-devkit8000.dtb \

	omap3-beagle-xm.dtb \

	omap3-evm.dtb \

	omap3-tobi.dtb \

	omap3-igep0020.dtb \

	omap3-igep0030.dtb \

	omap4-panda.dtb \

	omap4-panda-a4.dtb \

	omap4-panda-es.dtb \