aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Bénard <eric@eukrea.com>2011-02-25 09:04:14 -0500
committerSascha Hauer <s.hauer@pengutronix.de>2011-03-01 08:19:53 -0500
commit33d3487f557ea6787b1a8166b1ed123bb2136619 (patch)
tree4adc8bef9962b3b240f40af61e8b682a67982a51
parentb137214692effb1bc2221de8ccb11c09fb9df6f2 (diff)
cpuimx51sd: fix tsc2007
- wrong MUX was set before for IRQ - get_pendown_state is no more needed Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/mach-mx5/board-cpuimx51sd.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/arm/mach-mx5/board-cpuimx51sd.c b/arch/arm/mach-mx5/board-cpuimx51sd.c
index 6f5bcc1b38db..820146e4caa4 100644
--- a/arch/arm/mach-mx5/board-cpuimx51sd.c
+++ b/arch/arm/mach-mx5/board-cpuimx51sd.c
@@ -110,7 +110,7 @@ static iomux_v3_cfg_t eukrea_cpuimx51sd_pads[] = {
110 110
111 /* Touchscreen */ 111 /* Touchscreen */
112 /* IRQ */ 112 /* IRQ */
113 _MX51_PAD_CSI1_D8__GPIO3_12 | MUX_PAD_CTRL(PAD_CTL_PUS_22K_UP | 113 _MX51_PAD_GPIO_NAND__GPIO_NAND | MUX_PAD_CTRL(PAD_CTL_PUS_22K_UP |
114 PAD_CTL_PKE | PAD_CTL_SRE_FAST | 114 PAD_CTL_PKE | PAD_CTL_SRE_FAST |
115 PAD_CTL_DSE_HIGH | PAD_CTL_PUE | PAD_CTL_HYS), 115 PAD_CTL_DSE_HIGH | PAD_CTL_PUE | PAD_CTL_HYS),
116}; 116};
@@ -119,15 +119,9 @@ static const struct imxuart_platform_data uart_pdata __initconst = {
119 .flags = IMXUART_HAVE_RTSCTS, 119 .flags = IMXUART_HAVE_RTSCTS,
120}; 120};
121 121
122static int ts_get_pendown_state(void)
123{
124 return gpio_get_value(TSC2007_IRQGPIO) ? 0 : 1;
125}
126
127static struct tsc2007_platform_data tsc2007_info = { 122static struct tsc2007_platform_data tsc2007_info = {
128 .model = 2007, 123 .model = 2007,
129 .x_plate_ohms = 180, 124 .x_plate_ohms = 180,
130 .get_pendown_state = ts_get_pendown_state,
131}; 125};
132 126
133static struct i2c_board_info eukrea_cpuimx51sd_i2c_devices[] = { 127static struct i2c_board_info eukrea_cpuimx51sd_i2c_devices[] = {