Merge branch 'omap5-pm-linux-3.8.y' of git://gitorious.ti.com/~kristo/ti-linux-kernel...

Conflicts:
	arch/arm/boot/dts/omap5-evm.dts
	arch/arm/boot/dts/omap5.dtsi

diff --cc arch/arm/boot/dts/omap5-evm.dts
index 36952220ecb65c565d266c1b516f7a1c46a43ddf,0bf1caf2fc6d1a4e93f2538a2e9abefb32806084..d03e0077b251e6d1c94905c8ead388a3aa44c615
--- 1/arch/arm/boot/dts/omap5-evm.dts
--- 2/arch/arm/boot/dts/omap5-evm.dts
+++ b/arch/arm/boot/dts/omap5-evm.dts
@@@ -200,11 -152,16 +200,25 @@@
        device-handle = <&samsung_K3PE0E000B>;
  };
  
 +&usbhshost {
 +      port2-mode = "ehci-hsic";
 +      port3-mode = "ehci-hsic";
 +};
 +
 +&usbhsehci {
 +      phys = <0 &hsusb2_phy &hsusb3_phy>;
 +};
++
+ &i2c1 {
+       clock-frequency = <400000>;
+ 
+       palmas: palmas@48 {
+               reg = <0x48>;
+               /* SPI = 0, IRQ# = 7, 4 = active high level-sensitive */
+               interrupts = <0 7 4>; /* IRQ_SYS_1N cascaded to gic */
+               interrupt-parent = <&gic>;
+       };
+ 
+ };
+ 
+ /include/ "palmas.dtsi"

diff --cc arch/arm/boot/dts/omap5.dtsi
index 5d176fa17bd7b6099c79e160983d82f06a566387,150bff6a32d03636ce2c4a4ddf8e18d91ff9e2ca..ed6d4555df959aa07be43e25c20717d1d48aa0c1
--- 1/arch/arm/boot/dts/omap5.dtsi
--- 2/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@@ -501,82 -501,11 +501,89 @@@
                        hw-caps-temp-alert;
                };
  
 +              omap_control_usb: omap-control-usb@4a002300 {
 +                      compatible = "ti,omap-control-usb";
 +                      reg = <0x4a002300 0x4>,
 +                            <0x4a002370 0x4>;
 +                      reg-names = "control_dev_conf", "phy_power_usb";
 +                      ti,type = <2>;
 +              };
 +
 +              omap_dwc3@4a020000 {
 +                      compatible = "ti,dwc3";
 +                      ti,hwmods = "usb_otg_ss";
 +                      reg = <0x4a020000 0x1ff>;
 +                      interrupts = <0 93 4>;
 +                      #address-cells = <1>;
 +                      #size-cells = <1>;
 +                      utmi-mode = <2>;
 +                      ranges;
 +                      dwc3@4a030000 {
 +                              compatible = "synopsys,dwc3";
 +                              reg = <0x4a030000 0xcfff>;
 +                              interrupts = <0 92 4>;
 +                              usb-phy = <&usb2_phy>, <&usb3_phy>;
 +                              tx-fifo-resize;
 +                      };
 +              };
 +
 +              ocp2scp {
 +                      compatible = "ti,omap-ocp2scp";
 +                      #address-cells = <1>;
 +                      #size-cells = <1>;
 +                      ranges;
 +                      ti,hwmods = "ocp2scp1";
 +                      usb2_phy: usb2phy@4a084000 {
 +                              compatible = "ti,omap-usb2";
 +                              reg = <0x4a084000 0x7c>;
 +                              ctrl-module = <&omap_control_usb>;
 +                      };
 +
 +                      usb3_phy: usb3phy@4a084400 {
 +                              compatible = "ti,omap-usb3";
 +                              reg = <0x4a084400 0x80>,
 +                                    <0x4a084800 0x64>,
 +                                    <0x4a084c00 0x40>;
 +                              reg-names = "phy_rx", "phy_tx", "pll_ctrl";
 +                              ctrl-module = <&omap_control_usb>;
 +                      };
 +              };
 +
 +              usbhstll: usbhstll@4a062000 {
 +                      compatible = "ti,usbhs-tll";
 +                      reg = <0x4a062000 0x1000>;
 +                      interrupts = <0 78 0x4>;
 +                      ti,hwmods = "usb_tll_hs";
 +              };
 +
 +              usbhshost: usbhshost@4a064000 {
 +                      compatible = "ti,usbhs-host";
 +                      reg = <0x4a064000 0x800>;
 +                      ti,hwmods = "usb_host_hs";
 +                      #address-cells = <1>;
 +                      #size-cells = <1>;
 +                      ranges;
 +
 +                      usbhsohci: ohci@4a064800 {
 +                              compatible = "ti,ohci-omap3", "usb-ohci";
 +                              reg = <0x4a064800 0x400>;
 +                              interrupt-parent = <&gic>;
 +                              interrupts = <0 76 0x4>;
 +                      };
 +
 +                      usbhsehci: ehci@4a064c00 {
 +                              compatible = "ti,ehci-omap", "usb-ehci";
 +                              reg = <0x4a064c00 0x400>;
 +                              interrupt-parent = <&gic>;
 +                              interrupts = <0 77 0x4>;
 +                      };
 +              };
++
+               wdt2: wdt@4ae14000 {
+                       compatible = "ti,omap5-wdt", "ti,omap3-wdt";
+                       reg = <0x4ae14000 0x80>;
+                       interrupts = <0 80 0x4>;
+                       ti,hwmods = "wd_timer2";
+               };
        };
  };

diff --cc arch/arm/configs/omap2plus_defconfig
Simple merge