aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2012-04-06 04:30:42 -0400
committerRafael J. Wysocki <rjw@sisk.pl>2012-05-12 16:33:05 -0400
commit46cf668748070e54879d528fa58107abc835dff3 (patch)
tree883f32eb8a84204ecdefd6205ceaad5d17297002 /arch/arm/mach-shmobile
parentd8fed1e254ba1ed38fd2977fdac4c2e35ed5dbc1 (diff)
ARM: mach-shmobile: armadillo800eva: add support ST1232
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Reviewed-by: Simon Horman <horms@verge.net.au> Acked-by: Magnus Damm <damm@opensource.se> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'arch/arm/mach-shmobile')
-rw-r--r--arch/arm/mach-shmobile/board-armadillo800eva.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index d439e7f76187..4d066f9230dd 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -207,6 +207,14 @@ static struct platform_device gpio_keys_device = {
207 }, 207 },
208}; 208};
209 209
210/* I2C */
211static struct i2c_board_info i2c0_devices[] = {
212 {
213 I2C_BOARD_INFO("st1232-ts", 0x55),
214 .irq = evt2irq(0x0340),
215 },
216};
217
210/* 218/*
211 * board devices 219 * board devices
212 */ 220 */
@@ -265,6 +273,11 @@ static void __init eva_init(void)
265 gpio_request(GPIO_PORT202, NULL); /* LCD0_LED_CONT */ 273 gpio_request(GPIO_PORT202, NULL); /* LCD0_LED_CONT */
266 gpio_direction_output(GPIO_PORT202, 0); 274 gpio_direction_output(GPIO_PORT202, 0);
267 275
276 /* Touchscreen */
277 gpio_request(GPIO_FN_IRQ10, NULL); /* TP_INT */
278 gpio_request(GPIO_PORT166, NULL); /* TP_RST_B */
279 gpio_direction_output(GPIO_PORT166, 1);
280
268 /* GETHER */ 281 /* GETHER */
269 gpio_request(GPIO_FN_ET_CRS, NULL); 282 gpio_request(GPIO_FN_ET_CRS, NULL);
270 gpio_request(GPIO_FN_ET_MDC, NULL); 283 gpio_request(GPIO_FN_ET_MDC, NULL);
@@ -303,6 +316,8 @@ static void __init eva_init(void)
303 l2x0_init(__io(0xf0002000), 0x40440000, 0x82000fff); 316 l2x0_init(__io(0xf0002000), 0x40440000, 0x82000fff);
304#endif 317#endif
305 318
319 i2c_register_board_info(0, i2c0_devices, ARRAY_SIZE(i2c0_devices));
320
306 r8a7740_add_standard_devices(); 321 r8a7740_add_standard_devices();
307 322
308 platform_add_devices(eva_devices, 323 platform_add_devices(eva_devices,