diff options
author | Tony SIM <chinyeow.sim.xt@renesas.com> | 2011-01-10 19:47:59 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-10 22:58:19 -0500 |
commit | 6ae1e19dbb43ff0d429a9f45087c513212686836 (patch) | |
tree | 7fb52285a31fd7566c4bce98a614a8a42f51a71a | |
parent | 1dadad2ffcf90522bd66aa3fad5a325eda9115aa (diff) |
ARM: mach-shmobile: mackerel: Add touchscreen ST1232 support
Signed-off-by: Tony SIM <chinyeow.sim.xt@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r-- | arch/arm/mach-shmobile/board-mackerel.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c index f0547dcb1d8c..6601c595b1e0 100644 --- a/arch/arm/mach-shmobile/board-mackerel.c +++ b/arch/arm/mach-shmobile/board-mackerel.c | |||
@@ -963,6 +963,7 @@ static struct tca6416_keys_platform_data mackerel_tca6416_keys_info = { | |||
963 | }; | 963 | }; |
964 | 964 | ||
965 | /* I2C */ | 965 | /* I2C */ |
966 | #define IRQ7 evt2irq(0x02e0) | ||
966 | #define IRQ9 evt2irq(0x0320) | 967 | #define IRQ9 evt2irq(0x0320) |
967 | 968 | ||
968 | static struct i2c_board_info i2c0_devices[] = { | 969 | static struct i2c_board_info i2c0_devices[] = { |
@@ -975,6 +976,11 @@ static struct i2c_board_info i2c0_devices[] = { | |||
975 | .platform_data = &mackerel_tca6416_keys_info, | 976 | .platform_data = &mackerel_tca6416_keys_info, |
976 | .irq = IRQ9, | 977 | .irq = IRQ9, |
977 | }, | 978 | }, |
979 | /* Touchscreen */ | ||
980 | { | ||
981 | I2C_BOARD_INFO("st1232-ts", 0x55), | ||
982 | .irq = IRQ7, | ||
983 | }, | ||
978 | }; | 984 | }; |
979 | 985 | ||
980 | #define IRQ21 evt2irq(0x32a0) | 986 | #define IRQ21 evt2irq(0x32a0) |
@@ -1102,6 +1108,10 @@ static void __init mackerel_init(void) | |||
1102 | gpio_request(GPIO_FN_IRQ9_42, NULL); | 1108 | gpio_request(GPIO_FN_IRQ9_42, NULL); |
1103 | set_irq_type(IRQ9, IRQ_TYPE_LEVEL_HIGH); | 1109 | set_irq_type(IRQ9, IRQ_TYPE_LEVEL_HIGH); |
1104 | 1110 | ||
1111 | /* enable Touchscreen */ | ||
1112 | gpio_request(GPIO_FN_IRQ7_40, NULL); | ||
1113 | set_irq_type(IRQ7, IRQ_TYPE_LEVEL_LOW); | ||
1114 | |||
1105 | /* enable Accelerometer */ | 1115 | /* enable Accelerometer */ |
1106 | gpio_request(GPIO_FN_IRQ21, NULL); | 1116 | gpio_request(GPIO_FN_IRQ21, NULL); |
1107 | set_irq_type(IRQ21, IRQ_TYPE_LEVEL_HIGH); | 1117 | set_irq_type(IRQ21, IRQ_TYPE_LEVEL_HIGH); |