From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date: Thu, 20 Mar 2014 06:18:27 +0000 (+0200)
Subject: Merge branch '3.15/dss-dt-dts' into 3.15/fbdev
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=703cc5df19d5dfaeaab8695eba8ca436ca3a8b6f;p=linux-beck.git

Merge branch '3.15/dss-dt-dts' into 3.15/fbdev

OMAP DSS related .dts changes
---

703cc5df19d5dfaeaab8695eba8ca436ca3a8b6f
diff --cc arch/arm/boot/dts/omap3-gta04.dts
index c551e4af4d83,3ad9fddf2eb6..7d760aa4ed15
--- a/arch/arm/boot/dts/omap3-gta04.dts
+++ b/arch/arm/boot/dts/omap3-gta04.dts
@@@ -92,10 -106,16 +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";