From 7db7d5f2ed10ef625dcb4f2180bb45e01417367a Mon Sep 17 00:00:00 2001
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date: Fri, 6 Apr 2012 01:30:42 -0700
Subject: [PATCH] --- yaml --- r: 303483 b: refs/heads/master c:
 46cf668748070e54879d528fa58107abc835dff3 h: refs/heads/master i:   303481:
 98241960002524a15dc54d4bb45c9673f78b2cdd   303479:
 8070bae4fd31098988baee936b25cfa02e599929 v: v3

---
 [refs]                                            |  2 +-
 .../arm/mach-shmobile/board-armadillo800eva.c     | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 538b549ef0d2..1ecadad71317 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8fed1e254ba1ed38fd2977fdac4c2e35ed5dbc1
+refs/heads/master: 46cf668748070e54879d528fa58107abc835dff3
diff --git a/trunk/arch/arm/mach-shmobile/board-armadillo800eva.c b/trunk/arch/arm/mach-shmobile/board-armadillo800eva.c
index d439e7f76187..4d066f9230dd 100644
--- a/trunk/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/trunk/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -207,6 +207,14 @@ static struct platform_device gpio_keys_device = {
 	},
 };
 
+/* I2C */
+static struct i2c_board_info i2c0_devices[] = {
+	{
+		I2C_BOARD_INFO("st1232-ts", 0x55),
+		.irq = evt2irq(0x0340),
+	},
+};
+
 /*
  * board devices
  */
@@ -265,6 +273,11 @@ static void __init eva_init(void)
 	gpio_request(GPIO_PORT202, NULL); /* LCD0_LED_CONT */
 	gpio_direction_output(GPIO_PORT202, 0);
 
+	/* Touchscreen */
+	gpio_request(GPIO_FN_IRQ10,	NULL); /* TP_INT */
+	gpio_request(GPIO_PORT166,	NULL); /* TP_RST_B */
+	gpio_direction_output(GPIO_PORT166, 1);
+
 	/* GETHER */
 	gpio_request(GPIO_FN_ET_CRS,		NULL);
 	gpio_request(GPIO_FN_ET_MDC,		NULL);
@@ -303,6 +316,8 @@ static void __init eva_init(void)
 	l2x0_init(__io(0xf0002000), 0x40440000, 0x82000fff);
 #endif
 
+	i2c_register_board_info(0, i2c0_devices, ARRAY_SIZE(i2c0_devices));
+
 	r8a7740_add_standard_devices();
 
 	platform_add_devices(eva_devices,