summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile
diff options
context:
space:
mode:
authorKuninori Morimoto2012-04-06 10:30:42 +0200
committerRafael J. Wysocki2012-05-12 22:33:05 +0200
commit46cf668748070e54879d528fa58107abc835dff3 (patch)
tree883f32eb8a84204ecdefd6205ceaad5d17297002 /arch/arm/mach-shmobile
parentARM: mach-shmobile: armadillo800eva: add support sh_eth (diff)
downloadkernel-qcow2-linux-46cf668748070e54879d528fa58107abc835dff3.tar.gz
kernel-qcow2-linux-46cf668748070e54879d528fa58107abc835dff3.tar.xz
kernel-qcow2-linux-46cf668748070e54879d528fa58107abc835dff3.zip
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 = {
},
};
+/* 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,