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

Author: tmlind

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

@@ -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

@@ -1,7 +1,20 @@
 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

@@ -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

@@ -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

@@ -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 \

arch/arm/boot/dts/am335x-bone.dts

@@ -43,7 +43,7 @@
 status = "okay";
 };
 
-i2c1: i2c@44e0b000 {
+i2c0: i2c@44e0b000 {
 status = "okay";
 clock-frequency = <400000>;
 
@@ -59,27 +59,27 @@
 
 led@2 {
 label = "beaglebone:green:heartbeat";
-gpios = <&gpio2 21 0>;
+gpios = <&gpio1 21 0>;
 linux,default-trigger = "heartbeat";
 default-state = "off";
 };
 
 led@3 {
 label = "beaglebone:green:mmc0";
-gpios = <&gpio2 22 0>;
+gpios = <&gpio1 22 0>;
 linux,default-trigger = "mmc0";
 default-state = "off";
 };
 
 led@4 {
 label = "beaglebone:green:usr2";
-gpios = <&gpio2 23 0>;
+gpios = <&gpio1 23 0>;
 default-state = "off";
 };
 
 led@5 {
 label = "beaglebone:green:usr3";
-gpios = <&gpio2 24 0>;
+gpios = <&gpio1 24 0>;
 default-state = "off";
 };
 };

arch/arm/boot/dts/am335x-evm.dts

@@ -51,7 +51,7 @@
 status = "okay";
 };
 
-i2c1: i2c@44e0b000 {
+i2c0: i2c@44e0b000 {
 status = "okay";
 clock-frequency = <400000>;
 
@@ -60,7 +60,7 @@
 };
 };
 
-i2c2: i2c@4802a000 {
+i2c1: i2c@4802a000 {
 status = "okay";
 clock-frequency = <100000>;
 
@@ -123,12 +123,12 @@
 debounce-delay-ms = <5>;
 col-scan-delay-us = <2>;
 
-row-gpios = <&gpio2 25 0	/* Bank1, pin25 */
- &gpio2 26 0	/* Bank1, pin26 */
- &gpio2 27 0>;	/* Bank1, pin27 */
+row-gpios = <&gpio1 25 0	/* Bank1, pin25 */
+ &gpio1 26 0	/* Bank1, pin26 */
+ &gpio1 27 0>;	/* Bank1, pin27 */
 
-col-gpios = <&gpio2 21 0	/* Bank1, pin21 */
- &gpio2 22 0>;	/* Bank1, pin22 */
+col-gpios = <&gpio1 21 0	/* Bank1, pin21 */
+ &gpio1 22 0>;	/* Bank1, pin22 */
 
 linux,keymap = <0x0000008b	/* MENU */
 0x0100009e	/* BACK */
@@ -147,14 +147,14 @@
 switch@9 {
 label = "volume-up";
 linux,code = <115>;
-gpios = <&gpio1 2 1>;
+gpios = <&gpio0 2 1>;
 gpio-key,wakeup;
 };
 
 switch@10 {
 label = "volume-down";
 linux,code = <114>;
-gpios = <&gpio1 3 1>;
+gpios = <&gpio0 3 1>;
 gpio-key,wakeup;
 };
 };

arch/arm/boot/dts/am335x-evmsk.dts

@@ -58,7 +58,7 @@
 status = "okay";
 };
 
-i2c1: i2c@44e0b000 {
+i2c0: i2c@44e0b000 {
 status = "okay";
 clock-frequency = <400000>;
 
@@ -115,26 +115,26 @@
 
 led@1 {
 label = "evmsk:green:usr0";
-gpios = <&gpio2 4 0>;
+gpios = <&gpio1 4 0>;
 default-state = "off";
 };
 
 led@2 {
 label = "evmsk:green:usr1";
-gpios = <&gpio2 5 0>;
+gpios = <&gpio1 5 0>;
 default-state = "off";
 };
 
 led@3 {
 label = "evmsk:green:mmc0";
-gpios = <&gpio2 6 0>;
+gpios = <&gpio1 6 0>;
 linux,default-trigger = "mmc0";
 default-state = "off";
 };
 
 led@4 {
 label = "evmsk:green:heartbeat";
-gpios = <&gpio2 7 0>;
+gpios = <&gpio1 7 0>;
 linux,default-trigger = "heartbeat";
 default-state = "off";
 };
@@ -148,26 +148,26 @@
 switch@1 {
 label = "button0";
 linux,code = <0x100>;
-gpios = <&gpio3 3 0>;
+gpios = <&gpio2 3 0>;
 };
 
 switch@2 {
 label = "button1";
 linux,code = <0x101>;
-gpios = <&gpio3 2 0>;
+gpios = <&gpio2 2 0>;
 };
 
 switch@3 {
 label = "button2";
 linux,code = <0x102>;
-gpios = <&gpio1 30 0>;
+gpios = <&gpio0 30 0>;
 gpio-key,wakeup;
 };
 
 switch@4 {
 label = "button3";
 linux,code = <0x103>;
-gpios = <&gpio3 5 0>;
+gpios = <&gpio2 5 0>;
 };
 };
 };