Merge tag 'defconfig-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / omap3-gta04.dtsi

diff --git a/arch/arm/boot/dts/omap3-gta04.dtsi b/arch/arm/boot/dts/omap3-gta04.dtsi
index ee62d00bcbe633298bd24daf92677a593fcd790c..fb3a69604ed5ccebff4f90257c76ddfaad58a555 100644 (file)
--- a/arch/arm/boot/dts/omap3-gta04.dtsi
+++ b/arch/arm/boot/dts/omap3-gta04.dtsi
@@ -237,11 +237,18 @@
                reg = <0x48>;
                interrupts = <7>; /* SYS_NIRQ cascaded to intc */
                interrupt-parent = <&intc>;
-       };
 
-       twl_audio: audio {
-               compatible = "ti,twl4030-audio";
-               codec {
+               twl_audio: audio {
+                       compatible = "ti,twl4030-audio";
+                       ti,enable-vibra = <1>;
+                       codec {
+                               ti,ramp_delay_value = <3>;
+                       };
+               };
+
+               twl_power: power {
+                       compatible = "ti,twl4030-power";
+                       ti,use_poweroff;
                };
        };
 };
@@ -257,15 +264,23 @@
                compatible = "bosch,bmp085";
                reg = <0x77>;
                interrupt-parent = <&gpio4>;
-               interrupts = <17 IRQ_TYPE_EDGE_RISING>;
+               interrupts = <17 IRQ_TYPE_EDGE_RISING>; /* GPIO_113 */
        };
 
        /* accelerometer */
        bma180@41 {
                compatible = "bosch,bma180";
                reg = <0x41>;
-               interrupt-parent = <&gpio3>;
-               interrupts = <19 IRQ_TYPE_LEVEL_HIGH>;
+               interrupt-parent = <&gpio4>;
+               interrupts = <19 IRQ_TYPE_LEVEL_HIGH>; /* GPIO_115 */
+       };
+
+       /* gyroscope */
+       itg3200@68 {
+               compatible = "invensense,itg3200";
+               reg = <0x68>;
+               interrupt-parent = <&gpio2>;
+               interrupts = <24 0>; /* GPIO_56 */
        };
 
        /* leds */
@@ -316,7 +331,7 @@
                compatible = "ti,tsc2007";
                reg = <0x48>;
                interrupt-parent = <&gpio6>;
-               interrupts = <0 IRQ_TYPE_EDGE_FALLING>;
+               interrupts = <0 IRQ_TYPE_EDGE_FALLING>; /* GPIO_160 */
                gpios = <&gpio6 0 GPIO_ACTIVE_LOW>;
                ti,x-plate-ohms = <600>;
        };
@@ -355,12 +370,17 @@
        vmmc-supply = <&vaux4>;
        bus-width = <4>;
        ti,non-removable;
+       cap-power-off-card;
 };
 
 &mmc3 {
        status = "disabled";
 };
 
+&twl_keypad {
+       status = "disabled";
+};
+
 &uart1 {
        pinctrl-names = "default";
        pinctrl-0 = <&uart1_pins>;
@@ -377,8 +397,8 @@
 };
 
 &charger {
-       bb_uvolt = <3200000>;
-       bb_uamp = <150>;
+       ti,bb-uvolt = <3200000>;
+       ti,bb-uamp = <150>;
 };
 
 /* spare */
@@ -412,16 +432,12 @@
        regulator-max-microvolt = <3150000>;
 };
 
-/* Needed to power the DPI pins */
-&vpll2 {
-       regulator-always-on;
-};
-
 &dss {
        pinctrl-names = "default";
        pinctrl-0 = < &dss_dpi_pins >;
 
        status = "okay";
+       vdds_dsi-supply = <&vpll2>;
 
        port {
                dpi_out: endpoint {
@@ -498,3 +514,7 @@
                };
        };
 };
+
+&mcbsp2 {
+       status = "okay";
+};