aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/boards/mach-ecovec24/setup.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-09-14 05:26:38 -0400
committerPaul Mundt <lethal@linux-sh.org>2010-09-14 05:26:38 -0400
commit5d75b3a2476d848a354d939d2b89c36d3394ac59 (patch)
tree11bd7e9cc0679c99d384aff4dbd5d81c13397d0f /arch/sh/boards/mach-ecovec24/setup.c
parent51d149be0a535634b86493a4d910e3320cc984ea (diff)
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>
Diffstat (limited to 'arch/sh/boards/mach-ecovec24/setup.c')
-rw-r--r--arch/sh/boards/mach-ecovec24/setup.c26
1 files changed, 24 insertions, 2 deletions
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 = {
400 400
401/* TouchScreen */ 401/* TouchScreen */
402#define IRQ0 32 402#define IRQ0 32
403static int ts_get_pendown_state(void)
404{
405 int val = 0;
406 gpio_free(GPIO_FN_INTC_IRQ0);
407 gpio_request(GPIO_PTZ0, NULL);
408 gpio_direction_input(GPIO_PTZ0);
409
410 val = gpio_get_value(GPIO_PTZ0);
411
412 gpio_free(GPIO_PTZ0);
413 gpio_request(GPIO_FN_INTC_IRQ0, NULL);
414
415 return val ? 0 : 1;
416}
417
418static int ts_init(void)
419{
420 gpio_request(GPIO_FN_INTC_IRQ0, NULL);
421 return 0;
422}
423
403static struct tsc2007_platform_data tsc2007_info = { 424static struct tsc2007_platform_data tsc2007_info = {
404 .model = 2007, 425 .model = 2007,
405 .x_plate_ohms = 1000, 426 .x_plate_ohms = 180,
427 .get_pendown_state = ts_get_pendown_state,
428 .init_platform_hw = ts_init,
406}; 429};
407 430
408static struct i2c_board_info ts_i2c_clients = { 431static struct i2c_board_info ts_i2c_clients = {
@@ -1096,7 +1119,6 @@ static int __init arch_setup(void)
1096 gpio_direction_output(GPIO_PTF4, 1); 1119 gpio_direction_output(GPIO_PTF4, 1);
1097 1120
1098 /* enable TouchScreen */ 1121 /* enable TouchScreen */
1099 gpio_request(GPIO_FN_INTC_IRQ0, NULL);
1100 i2c_register_board_info(0, &ts_i2c_clients, 1); 1122 i2c_register_board_info(0, &ts_i2c_clients, 1);
1101 set_irq_type(IRQ0, IRQ_TYPE_LEVEL_LOW); 1123 set_irq_type(IRQ0, IRQ_TYPE_LEVEL_LOW);
1102 } 1124 }