From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 17 Mar 2014 14:17:07 +0000 (+0100)
Subject: Merge tag 'omap-for-v3.15/dt-overo-signed' of git://git.kernel.org/pub/scm/linux... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=38edc2da5014e70e46a724d97c3ef3dde106331b;p=linux-beck.git

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

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

38edc2da5014e70e46a724d97c3ef3dde106331b
diff --cc arch/arm/boot/dts/omap3-gta04.dts
index 3ad9fddf2eb6,c551e4af4d83..7d760aa4ed15
--- a/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-overo.dtsi
index b08142f755fd,c37b1301115b..69ca7c45bca2
--- a/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";
 +};