Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d7bdd32 authored by Sebastian Reichel's avatar Sebastian Reichel Committed by Tony Lindgren
Browse files

ARM: dts: omap4-droid4: update touchscreen



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: default avatarSebastian Reichel <sebastian.reichel@collabora.co.uk>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent f88bf4fc
Loading
Loading
Loading
Loading
+6 −16
Original line number Diff line number Diff line
@@ -124,13 +124,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>;
@@ -362,22 +355,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;
	};
@@ -435,6 +424,7 @@

	touchscreen_pins: pinmux_touchscreen_pins {
		pinctrl-single,pins = <
		OMAP4_IOPAD(0x180, PIN_OUTPUT | MUX_MODE3)
		OMAP4_IOPAD(0x1a0, PIN_INPUT_PULLUP | MUX_MODE3)
		>;
	};