123 lines
3.8 KiB
Diff
123 lines
3.8 KiB
Diff
From fa1d43818de208bdc2fd789777c538ab4aa7956a Mon Sep 17 00:00:00 2001
|
|
From: Aaro Koskinen <Aaro.Koskinen@nokia.com>
|
|
Date: Fri, 12 Mar 2010 16:54:34 +0000
|
|
Subject: [PATCH 8/10] omap: rx-51: enable tsc2005
|
|
|
|
Patch-mainline: 2.6.35
|
|
Discussions: http://www.mail-archive.com/linux-omap@vger.kernel.org/msg26749.html
|
|
|
|
Enable TSC2005 touchscreen driver on the RX-51 board.
|
|
|
|
Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>
|
|
---
|
|
arch/arm/configs/rx51_defconfig | 1
|
|
arch/arm/mach-omap2/board-rx51-peripherals.c | 46 +++++++++++++++++++++++++--
|
|
2 files changed, 45 insertions(+), 2 deletions(-)
|
|
|
|
Index: linux-2.6.33-master/arch/arm/configs/rx51_defconfig
|
|
===================================================================
|
|
--- linux-2.6.33-master.orig/arch/arm/configs/rx51_defconfig 2010-04-19 17:28:20.000000000 +0300
|
|
+++ linux-2.6.33-master/arch/arm/configs/rx51_defconfig 2010-04-19 17:28:28.000000000 +0300
|
|
@@ -801,6 +801,7 @@
|
|
# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
|
|
# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
|
|
# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
|
|
+CONFIG_TOUCHSCREEN_TSC2005=m
|
|
# CONFIG_TOUCHSCREEN_TSC2007 is not set
|
|
CONFIG_INPUT_MISC=y
|
|
# CONFIG_INPUT_ATI_REMOTE is not set
|
|
Index: linux-2.6.33-master/arch/arm/mach-omap2/board-rx51-peripherals.c
|
|
===================================================================
|
|
--- linux-2.6.33-master.orig/arch/arm/mach-omap2/board-rx51-peripherals.c 2010-04-19 17:28:20.000000000 +0300
|
|
+++ linux-2.6.33-master/arch/arm/mach-omap2/board-rx51-peripherals.c 2010-04-19 17:28:28.000000000 +0300
|
|
@@ -14,6 +14,7 @@
|
|
#include <linux/input.h>
|
|
#include <linux/input/matrix_keypad.h>
|
|
#include <linux/spi/spi.h>
|
|
+#include <linux/spi/tsc2005.h>
|
|
#include <linux/spi/wl12xx.h>
|
|
#include <linux/i2c.h>
|
|
#include <linux/i2c/twl.h>
|
|
@@ -42,6 +43,9 @@
|
|
#define RX51_WL1251_POWER_GPIO 87
|
|
#define RX51_WL1251_IRQ_GPIO 42
|
|
|
|
+#define RX51_TSC2005_RESET_GPIO 104
|
|
+#define RX51_TSC2005_IRQ_GPIO 100
|
|
+
|
|
/* list all spi devices here */
|
|
enum {
|
|
RX51_SPI_WL1251,
|
|
@@ -50,6 +54,7 @@
|
|
};
|
|
|
|
static struct wl12xx_platform_data wl1251_pdata;
|
|
+static struct tsc2005_platform_data tsc2005_pdata;
|
|
|
|
static struct omap2_mcspi_device_config wl1251_mcspi_config = {
|
|
.turbo_mode = 0,
|
|
@@ -87,10 +92,10 @@
|
|
.modalias = "tsc2005",
|
|
.bus_num = 1,
|
|
.chip_select = 0,
|
|
- /* .irq = OMAP_GPIO_IRQ(RX51_TSC2005_IRQ_GPIO),*/
|
|
+ .irq = OMAP_GPIO_IRQ(RX51_TSC2005_IRQ_GPIO),
|
|
.max_speed_hz = 6000000,
|
|
.controller_data = &tsc2005_mcspi_config,
|
|
- /* .platform_data = &tsc2005_config,*/
|
|
+ .platform_data = &tsc2005_pdata,
|
|
},
|
|
};
|
|
|
|
@@ -708,6 +713,42 @@
|
|
|
|
#endif
|
|
|
|
+static struct tsc2005_platform_data tsc2005_pdata = {
|
|
+ .ts_pressure_max = 2048,
|
|
+ .ts_pressure_fudge = 2,
|
|
+ .ts_x_max = 4096,
|
|
+ .ts_x_fudge = 4,
|
|
+ .ts_y_max = 4096,
|
|
+ .ts_y_fudge = 7,
|
|
+ .ts_x_plate_ohm = 280,
|
|
+ .esd_timeout_ms = 8000,
|
|
+};
|
|
+
|
|
+static void rx51_tsc2005_set_reset(bool enable)
|
|
+{
|
|
+ gpio_set_value(RX51_TSC2005_RESET_GPIO, enable);
|
|
+}
|
|
+
|
|
+static void __init rx51_init_tsc2005(void)
|
|
+{
|
|
+ int r;
|
|
+
|
|
+ r = gpio_request(RX51_TSC2005_IRQ_GPIO, "tsc2005 IRQ");
|
|
+ if (r >= 0)
|
|
+ gpio_direction_input(RX51_TSC2005_IRQ_GPIO);
|
|
+ else
|
|
+ printk(KERN_ERR "unable to get %s GPIO\n", "tsc2005 IRQ");
|
|
+
|
|
+ r = gpio_request(RX51_TSC2005_RESET_GPIO, "tsc2005 reset");
|
|
+ if (r >= 0) {
|
|
+ gpio_direction_output(RX51_TSC2005_RESET_GPIO, 1);
|
|
+ tsc2005_pdata.set_reset = rx51_tsc2005_set_reset;
|
|
+ } else {
|
|
+ printk(KERN_ERR "unable to get %s GPIO\n", "tsc2005 reset");
|
|
+ tsc2005_pdata.esd_timeout_ms = 0;
|
|
+ }
|
|
+}
|
|
+
|
|
#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
|
|
|
|
static struct omap_smc91x_platform_data board_smc91x_data = {
|
|
@@ -792,6 +833,7 @@
|
|
board_smc91x_init();
|
|
rx51_add_gpio_keys();
|
|
rx51_init_wl1251();
|
|
+ rx51_init_tsc2005();
|
|
spi_register_board_info(rx51_peripherals_spi_board_info,
|
|
ARRAY_SIZE(rx51_peripherals_spi_board_info));
|
|
}
|