From: David Brownell <dbrownell@users.sourceforge.net>
Date: Tue, 16 May 2006 09:46:42 +0000 (-0700)
Subject: [PATCH] ARM: OMAP: Mistral ads7846 pendown state
X-Git-Tag: v2.6.17-omap1~57
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e87bb41af75898e72f93683a4c63e6c6c400be07;p=linux-2.6-omap-h63xx.git

[PATCH] ARM: OMAP: Mistral ads7846 pendown state

Syncing the ads7846 code with mainstream means that the Mistral support
needs to include a callback to read the pendown state.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index 8f8f50b7058..e0711d23a6b 100644
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@ -299,12 +299,17 @@ static struct platform_device *mistral_devices[] __initdata = {
 	&osk5912_lcd_device,
 };
 
+static int mistral_get_pendown_state(void)
+{
+	return !omap_get_gpio_datain(4);
+}
+
 static const struct ads7846_platform_data mistral_ts_info = {
 	.model			= 7846,
 	.vref_delay_usecs	= 100,	/* internal, no capacitor */
 	.x_plate_ohms		= 419,
 	.y_plate_ohms		= 486,
-	// .{x,y,pressure}_{min,max}
+	.get_pendown_state	= mistral_get_pendown_state,
 };
 
 static struct spi_board_info __initdata mistral_boardinfo[] = { {