From: Paul Mundt <lethal@linux-sh.org>
Date: Tue, 14 Sep 2010 09:26:38 +0000 (+0900)
Subject: Revert "sh: ecovec24: modify tsc2007 platform settings"
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5d75b3a2476d848a354d939d2b89c36d3394ac59;p=linux-beck.git

Revert "sh: ecovec24: modify tsc2007 platform settings"

According to Morimoto-san, this is no longer needed. Revert it.

This reverts commit e0009b0a44f28227571d8cddebc5ccdae86027a6.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index db7a7c0e859a..1d7b495a7db4 100644
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -400,9 +400,32 @@ static struct platform_device keysc_device = {
 
 /* TouchScreen */
 #define IRQ0 32
+static int ts_get_pendown_state(void)
+{
+	int val = 0;
+	gpio_free(GPIO_FN_INTC_IRQ0);
+	gpio_request(GPIO_PTZ0, NULL);
+	gpio_direction_input(GPIO_PTZ0);
+
+	val = gpio_get_value(GPIO_PTZ0);
+
+	gpio_free(GPIO_PTZ0);
+	gpio_request(GPIO_FN_INTC_IRQ0, NULL);
+
+	return val ? 0 : 1;
+}
+
+static int ts_init(void)
+{
+	gpio_request(GPIO_FN_INTC_IRQ0, NULL);
+	return 0;
+}
+
 static struct tsc2007_platform_data tsc2007_info = {
 	.model			= 2007,
-	.x_plate_ohms		= 1000,
+	.x_plate_ohms		= 180,
+	.get_pendown_state	= ts_get_pendown_state,
+	.init_platform_hw	= ts_init,
 };
 
 static struct i2c_board_info ts_i2c_clients = {
@@ -1096,7 +1119,6 @@ static int __init arch_setup(void)
 		gpio_direction_output(GPIO_PTF4, 1);
 
 		/* enable TouchScreen */
-		gpio_request(GPIO_FN_INTC_IRQ0, NULL);
 		i2c_register_board_info(0, &ts_i2c_clients, 1);
 		set_irq_type(IRQ0, IRQ_TYPE_LEVEL_LOW);
 	}