Merge tag 'omap-for-v3.15/dt-overo-signed' of git://git.kernel.org/pub/scm/linux...

Updates to the .dts files to support more Gumstix boards.

These are sent separately from the rest of the .dts changes
as these depend on the fixes merged into v3.14-rc4, and
needed a bit more time to get updated on the fixes.

* tag 'omap-for-v3.15/dt-overo-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: Add support for the Overo Summit
  ARM: dts: Add support for the Overo Chestnut43
  ARM: dts: Add support for the Overo Alto35
  ARM: dts: Add support for the Overo Gallop43
  ARM: dts: Add support for the Overo Palo43
  ARM: dts: overo: Add LIS33DE accelerometer
  ARM: dts: overo: Create a file for common Gumstix peripherals
  ARM: dts: overo: Push uart3 pinmux down to expansion board
  ARM: dts: omap3-tobi: Add AT24C01 EEPROM
  ARM: dts: omap3-tobi: Use include file omap-gpmc-smsc9221
  ARM: dts: omap: Add common file for SMSC9221
  ARM: dts: omap3-overo: Add HSUSB PHY
  ARM: dts: omap3-overo: Enable WiFi/BT combo
  ARM: dts: omap3-overo: Add missing pinctrl
  ARM: dts: omap3-tobi: Add missing pinctrl
  ARM: dts: overo: reorganize include files

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Conflicts:
	arch/arm/boot/dts/omap3-overo.dtsi

diff --cc Documentation/devicetree/bindings/arm/omap/omap.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/boot/dts/Makefile
Simple merge

diff --cc arch/arm/boot/dts/am335x-evmsk.dts
Simple merge

diff --cc arch/arm/boot/dts/omap3-gta04.dts
index 3ad9fddf2eb67af6dfca0a1cf4d45a399c848f94,c551e4af4d83712f67b69b260be16434523305d9..7d760aa4ed15e2d8fb396c6bfab01b4adac15bd0
--- 1/arch/arm/boot/dts/omap3-gta04.dts
--- 2/arch/arm/boot/dts/omap3-gta04.dts
+++ b/arch/arm/boot/dts/omap3-gta04.dts
@@@ -106,16 -92,10 +106,18 @@@
        bmp085@77 {
                compatible = "bosch,bmp085";
                reg = <0x77>;
+               interrupt-parent = <&gpio4>;
+               interrupts = <17 IRQ_TYPE_EDGE_RISING>;
        };
  
 +      /* accelerometer */
 +      bma180@41 {
 +              compatible = "bosch,bma180";
 +              reg = <0x41>;
 +              interrupt-parent = <&gpio3>;
 +              interrupts = <19 IRQ_TYPE_LEVEL_HIGH>;
 +      };
 +
        /* leds */
        tca6507@45 {
                compatible = "ti,tca6507";

diff --cc arch/arm/boot/dts/omap3-n900.dts
Simple merge

diff --cc arch/arm/boot/dts/omap3-overo.dtsi
index b08142f755fd258910f3d991802989635e2f594b,c37b1301115b616c20880525124a713aa6d0eb29..69ca7c45bca29399ef38a52320802439bf7422bd
--- 1/arch/arm/boot/dts/omap3-overo.dtsi
--- 2/arch/arm/boot/dts/omap3-overo.dtsi
+++ b/arch/arm/boot/dts/omap3-overo.dtsi
@@@ -91,11 -33,3 +33,6 @@@
        };
  };
  
- &uart3 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&uart3_pins>;
- };
- 
 +&mcbsp2 {
 +      status = "okay";
 +};