aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorDavid Brownell <dbrownell@users.sourceforge.net>2006-06-26 19:16:04 -0400
committerTony Lindgren <tony@atomide.com>2006-06-26 19:16:04 -0400
commite8cdf7bdf3efbb1e285fd82a86a3f8fae5ae2665 (patch)
treecceb1d88948fa987b3e6f2724ab451b9a1b36324 /arch/arm
parent495f71db30e279a5a696fa6622fc75451caa8366 (diff)
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>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-omap1/board-osk.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index 8f8f50b70588..e0711d23a6b0 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 = {
299 &osk5912_lcd_device, 299 &osk5912_lcd_device,
300}; 300};
301 301
302static int mistral_get_pendown_state(void)
303{
304 return !omap_get_gpio_datain(4);
305}
306
302static const struct ads7846_platform_data mistral_ts_info = { 307static const struct ads7846_platform_data mistral_ts_info = {
303 .model = 7846, 308 .model = 7846,
304 .vref_delay_usecs = 100, /* internal, no capacitor */ 309 .vref_delay_usecs = 100, /* internal, no capacitor */
305 .x_plate_ohms = 419, 310 .x_plate_ohms = 419,
306 .y_plate_ohms = 486, 311 .y_plate_ohms = 486,
307 // .{x,y,pressure}_{min,max} 312 .get_pendown_state = mistral_get_pendown_state,
308}; 313};
309 314
310static struct spi_board_info __initdata mistral_boardinfo[] = { { 315static struct spi_board_info __initdata mistral_boardinfo[] = { {