Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[linux-2.6-microblaze.git] / arch / arm / boot / dts / imx50-kobo-aura.dts

diff --git a/arch/arm/boot/dts/imx50-kobo-aura.dts b/arch/arm/boot/dts/imx50-kobo-aura.dts
index 53b3995..97cfd97 100644 (file)
--- a/arch/arm/boot/dts/imx50-kobo-aura.dts
+++ b/arch/arm/boot/dts/imx50-kobo-aura.dts
@@ -6,6 +6,7 @@
 /dts-v1/;
 #include "imx50.dtsi"
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/interrupt-controller/irq.h>
 
 / {
        model = "Kobo Aura (N514)";
@@ -119,7 +120,14 @@
        pinctrl-0 = <&pinctrl_i2c1>;
        status = "okay";
 
-       /* TODO: ektf2132 touch controller at 0x15 */
+       touchscreen@15 {
+               reg = <0x15>;
+               compatible = "elan,ektf2132";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_ts>;
+               power-gpios = <&gpio4 9 GPIO_ACTIVE_HIGH>;
+               interrupts-extended = <&gpio5 13 IRQ_TYPE_EDGE_FALLING>;
+       };
 };
 
 &i2c2 {
@@ -225,6 +233,13 @@
                >;
        };
 
+       pinctrl_ts: tsgrp {
+               fsl,pins = <
+                       MX50_PAD_CSPI_MOSI__GPIO4_9             0x0
+                       MX50_PAD_SD2_D5__GPIO5_13               0x0
+               >;
+       };
+
        pinctrl_uart2: uart2grp {
                fsl,pins = <
                        MX50_PAD_UART2_TXD__UART2_TXD_MUX       0x1e4