mirror of https://github.com/parazyd/arm-sdk.git
68 lines
1.9 KiB
Diff
68 lines
1.9 KiB
Diff
From: Sebastian Reichel <sebastian.reichel@xxxxxxxxxxxxxxx>
|
|
|
|
Update the Droid 4 devicetree to properly describe the reset
|
|
GPIO. Also rename the node to touchscreen instead of tsp,
|
|
which seems to be commonly used for touchscreens.
|
|
|
|
Signed-off-by: Sebastian Reichel <sebastian.reichel@xxxxxxxxxxxxxxx>
|
|
---
|
|
arch/arm/boot/dts/omap4-droid4-xt894.dts | 22 ++++++----------------
|
|
1 file changed, 6 insertions(+), 16 deletions(-)
|
|
|
|
diff --git a/arch/arm/boot/dts/omap4-droid4-xt894.dts b/arch/arm/boot/dts/omap4-droid4-xt894.dts
|
|
index 81c701929c70..40df997fc453 100644
|
|
--- a/arch/arm/boot/dts/omap4-droid4-xt894.dts
|
|
+++ b/arch/arm/boot/dts/omap4-droid4-xt894.dts
|
|
@@ -145,13 +145,6 @@
|
|
};
|
|
|
|
&gpio6 {
|
|
- touchscreen_reset {
|
|
- gpio-hog;
|
|
- gpios = <13 0>;
|
|
- output-high;
|
|
- line-name = "touchscreen-reset";
|
|
- };
|
|
-
|
|
pwm8: dmtimer-pwm-8 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&vibrator_direction_pin>;
|
|
@@ -385,22 +378,18 @@
|
|
};
|
|
};
|
|
|
|
-/*
|
|
- * REVISIT: Add gpio173 reset pin handling to the driver, see gpio-hog above.
|
|
- * If the GPIO reset is used, we probably need to have /lib/firmware/maxtouch.fw
|
|
- * available. See "mxt-app" and "droid4-touchscreen-firmware" tools for more
|
|
- * information.
|
|
- */
|
|
&i2c2 {
|
|
- tsp@4a {
|
|
+ touchscreen@4a {
|
|
compatible = "atmel,maxtouch";
|
|
reg = <0x4a>;
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&touchscreen_pins>;
|
|
|
|
+ reset-gpios = <&gpio6 13 GPIO_ACTIVE_HIGH>; /* gpio173 */
|
|
+
|
|
/* gpio_183 with sys_nirq2 pad as wakeup */
|
|
- interrupts-extended = <&gpio6 23 IRQ_TYPE_EDGE_FALLING
|
|
- &omap4_pmx_core 0x160>;
|
|
+ interrupts-extended = <&gpio6 23 IRQ_TYPE_EDGE_FALLING>,
|
|
+ <&omap4_pmx_core 0x160>;
|
|
interrupt-names = "irq", "wakeup";
|
|
wakeup-source;
|
|
};
|
|
@@ -484,6 +473,7 @@
|
|
|
|
touchscreen_pins: pinmux_touchscreen_pins {
|
|
pinctrl-single,pins = <
|
|
+ OMAP4_IOPAD(0x180, PIN_OUTPUT | MUX_MODE3)
|
|
OMAP4_IOPAD(0x1a0, PIN_INPUT_PULLUP | MUX_MODE3)
|
|
>;
|
|
};
|
|
--
|
|
2.15.1
|