From: Grazvydas Ignotas Date: Thu, 6 Nov 2008 19:49:56 +0000 (+0200) Subject: Add touchscreen support for Pandora X-Git-Tag: v2.6.28-omap1~155 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3f3cb2b70fa44f6e0096a1e67198178ca5fc926b;p=linux-2.6-omap-h63xx.git Add touchscreen support for Pandora This patch adds ADS7846 compatible touchscreen support for OMAP3 Pandora. Signed-off-by: Grazvydas Ignotas Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c index 8a6c75fea78..6a29ed6d8b8 100644 --- a/arch/arm/mach-omap2/board-omap3pandora.c +++ b/arch/arm/mach-omap2/board-omap3pandora.c @@ -25,6 +25,8 @@ #include #include +#include +#include #include #include @@ -45,6 +47,7 @@ #include #include #include +#include #include "sdram-micron-mt46h32m32lf-6.h" #include "mmc-twl4030.h" @@ -54,6 +57,8 @@ #define GPMC_CS0_BASE 0x60 #define GPMC_CS_SIZE 0x30 +#define OMAP3_PANDORA_TS_GPIO 94 + static struct mtd_partition omap3pandora_nand_partitions[] = { { .name = "xloader", @@ -185,6 +190,55 @@ static void __init omap3pandora_init_irq(void) omap_gpio_init(); } +static void __init omap3pandora_ads7846_init(void) +{ + int gpio = OMAP3_PANDORA_TS_GPIO; + int ret; + + ret = gpio_request(gpio, "ads7846_pen_down"); + if (ret < 0) { + printk(KERN_ERR "Failed to request GPIO %d for " + "ads7846 pen down IRQ\n", gpio); + return; + } + + gpio_direction_input(gpio); +} + +static int ads7846_get_pendown_state(void) +{ + return !gpio_get_value(OMAP3_PANDORA_TS_GPIO); +} + +static struct ads7846_platform_data ads7846_config = { + .x_max = 0x0fff, + .y_max = 0x0fff, + .x_plate_ohms = 180, + .pressure_max = 255, + .debounce_max = 10, + .debounce_tol = 3, + .debounce_rep = 1, + .get_pendown_state = ads7846_get_pendown_state, + .keep_vref_on = 1, +}; + +static struct omap2_mcspi_device_config ads7846_mcspi_config = { + .turbo_mode = 0, + .single_channel = 1, /* 0: slave, 1: master */ +}; + +static struct spi_board_info omap3pandora_spi_board_info[] __initdata = { + { + .modalias = "ads7846", + .bus_num = 1, + .chip_select = 0, + .max_speed_hz = 1500000, + .controller_data = &ads7846_mcspi_config, + .irq = OMAP_GPIO_IRQ(OMAP3_PANDORA_TS_GPIO), + .platform_data = &ads7846_config, + } +}; + static struct platform_device omap3pandora_lcd_device = { .name = "pandora_lcd", .id = -1, @@ -220,10 +274,13 @@ static void __init omap3pandora_init(void) omap_board_config = omap3pandora_config; omap_board_config_size = ARRAY_SIZE(omap3pandora_config); omap_serial_init(); + spi_register_board_info(omap3pandora_spi_board_info, + ARRAY_SIZE(omap3pandora_spi_board_info)); hsmmc_init(mmc); usb_musb_init(); usb_ehci_init(); omap3pandora_flash_init(); + omap3pandora_ads7846_init(); } static void __init omap3pandora_map_io(void)