From c4cf5be654b3a50c62639dcb7bb95410b1e8844f Mon Sep 17 00:00:00 2001
From: Bastian Hecht <hechtb@gmail.com>
Date: Mon, 15 Apr 2013 09:40:59 -0700
Subject: [PATCH] --- yaml --- r: 368098 b: refs/heads/master c:
 cbaf7f808081e10bd2a1d57cc9ef0c5138ca23ce h: refs/heads/master v: v3

---
 [refs]                                               | 2 +-
 trunk/arch/arm/mach-shmobile/board-armadillo800eva.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 764e38f86a8a..67c6db785e00 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6a90810559cc3755a5b1629d1fd0b914462f98c
+refs/heads/master: cbaf7f808081e10bd2a1d57cc9ef0c5138ca23ce
diff --git a/trunk/arch/arm/mach-shmobile/board-armadillo800eva.c b/trunk/arch/arm/mach-shmobile/board-armadillo800eva.c
index f2ec0777cfbe..5dc09358fedd 100644
--- a/trunk/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/trunk/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -24,6 +24,7 @@
 #include <linux/err.h>
 #include <linux/kernel.h>
 #include <linux/input.h>
+#include <linux/platform_data/st1232_pdata.h>
 #include <linux/irq.h>
 #include <linux/platform_device.h>
 #include <linux/gpio.h>
@@ -878,10 +879,15 @@ static struct platform_device i2c_gpio_device = {
 };
 
 /* I2C */
+static struct st1232_pdata st1232_i2c0_pdata = {
+	.reset_gpio = 166,
+};
+
 static struct i2c_board_info i2c0_devices[] = {
 	{
 		I2C_BOARD_INFO("st1232-ts", 0x55),
 		.irq = evt2irq(0x0340),
+		.platform_data = &st1232_i2c0_pdata,
 	},
 	{
 		I2C_BOARD_INFO("wm8978", 0x1a),
@@ -1005,7 +1011,6 @@ static void __init eva_init(void)
 
 	/* Touchscreen */
 	gpio_request(GPIO_FN_IRQ10,	NULL); /* TP_INT */
-	gpio_request_one(GPIO_PORT166, GPIOF_OUT_INIT_HIGH, NULL); /* TP_RST_B */
 
 	/* GETHER */
 	gpio_request(GPIO_FN_ET_CRS,		NULL);