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

OMAP DSS related .dts changes

diff --cc Documentation/devicetree/bindings/arm/omap/omap.txt
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 c551e4af4d83712f67b69b260be16434523305d9,3ad9fddf2eb67af6dfca0a1cf4d45a399c848f94..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
@@@ -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";

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

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