Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Signed-off-by: Tony Lindgren <tony@atomide.com>

authored by

Sebastian Reichel and committed by
Tony Lindgren
6d7bdd32 f88bf4fc

+6 -16
+6 -16
arch/arm/boot/dts/omap4-droid4-xt894.dts
··· 124 124 }; 125 125 126 126 &gpio6 { 127 - touchscreen_reset { 128 - gpio-hog; 129 - gpios = <13 0>; 130 - output-high; 131 - line-name = "touchscreen-reset"; 132 - }; 133 - 134 127 pwm8: dmtimer-pwm-8 { 135 128 pinctrl-names = "default"; 136 129 pinctrl-0 = <&vibrator_direction_pin>; ··· 355 362 }; 356 363 }; 357 364 358 - /* 359 - * REVISIT: Add gpio173 reset pin handling to the driver, see gpio-hog above. 360 - * If the GPIO reset is used, we probably need to have /lib/firmware/maxtouch.fw 361 - * available. See "mxt-app" and "droid4-touchscreen-firmware" tools for more 362 - * information. 363 - */ 364 365 &i2c2 { 365 - tsp@4a { 366 + touchscreen@4a { 366 367 compatible = "atmel,maxtouch"; 367 368 reg = <0x4a>; 368 369 pinctrl-names = "default"; 369 370 pinctrl-0 = <&touchscreen_pins>; 370 371 372 + reset-gpios = <&gpio6 13 GPIO_ACTIVE_HIGH>; /* gpio173 */ 373 + 371 374 /* gpio_183 with sys_nirq2 pad as wakeup */ 372 - interrupts-extended = <&gpio6 23 IRQ_TYPE_EDGE_FALLING 373 - &omap4_pmx_core 0x160>; 375 + interrupts-extended = <&gpio6 23 IRQ_TYPE_EDGE_FALLING>, 376 + <&omap4_pmx_core 0x160>; 374 377 interrupt-names = "irq", "wakeup"; 375 378 wakeup-source; 376 379 }; ··· 424 435 425 436 touchscreen_pins: pinmux_touchscreen_pins { 426 437 pinctrl-single,pins = < 438 + OMAP4_IOPAD(0x180, PIN_OUTPUT | MUX_MODE3) 427 439 OMAP4_IOPAD(0x1a0, PIN_INPUT_PULLUP | MUX_MODE3) 428 440 >; 429 441 };