Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6-block.git] / arch / arm / boot / dts / omap3-n900.dts

diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
index a289910ec362cc54fe43c2fa041530a9648af09e..ae8ae3f4f9bfd25870735289c175325d0f9bd440 100644 (file)
--- a/arch/arm/boot/dts/omap3-n900.dts
+++ b/arch/arm/boot/dts/omap3-n900.dts
@@ -22,6 +22,17 @@
                };
        };
 
+       leds {
+               compatible = "gpio-leds";
+               heartbeat {
+                       label = "debug::sleep";
+                       gpios = <&gpio6 2 GPIO_ACTIVE_HIGH>;  /* gpio162 */
+                       linux,default-trigger = "default-on";
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&debug_leds>;
+               };
+       };
+
        memory {
                device_type = "memory";
                reg = <0x80000000 0x10000000>; /* 256 MB */
@@ -144,6 +155,12 @@
                >;
        };
 
+       debug_leds: pinmux_debug_led_pins {
+               pinctrl-single,pins = <
+                       OMAP3_CORE1_IOPAD(0x2198, PIN_OUTPUT | MUX_MODE4)       /* mcbsp1_clkx.gpio_162 */
+               >;
+       };
+
        mcspi4_pins: pinmux_mcspi4_pins {
                pinctrl-single,pins = <
                        0x15c (PIN_INPUT_PULLDOWN | MUX_MODE1) /* mcspi4_clk */
@@ -634,9 +651,24 @@
         * Also... order in the device tree actually matters here.
         */
        tsc2005@0 {
-               compatible = "tsc2005";
+               compatible = "ti,tsc2005";
                spi-max-frequency = <6000000>;
                reg = <0>;
+
+               vio-supply = <&vio>;
+
+               reset-gpios = <&gpio4 8 GPIO_ACTIVE_HIGH>; /* 104 */
+               interrupts-extended = <&gpio4 4 IRQ_TYPE_EDGE_RISING>; /* 100 */
+
+               touchscreen-fuzz-x = <4>;
+               touchscreen-fuzz-y = <7>;
+               touchscreen-fuzz-pressure = <2>;
+               touchscreen-max-x = <4096>;
+               touchscreen-max-y = <4096>;
+               touchscreen-max-pressure = <2048>;
+
+               ti,x-plate-ohms = <280>;
+               ti,esd-recovery-timeout-ms = <8000>;
        };
 
        acx565akm@2 {
@@ -696,11 +728,13 @@
 };
 
 &uart2 {
+       interrupts-extended = <&intc 73 &omap3_pmx_core OMAP3_UART2_RX>;
        pinctrl-names = "default";
        pinctrl-0 = <&uart2_pins>;
 };
 
 &uart3 {
+       interrupts-extended = <&intc 74 &omap3_pmx_core OMAP3_UART3_RX>;
        pinctrl-names = "default";
        pinctrl-0 = <&uart3_pins>;
 };