diff options
author | David Brownell <david-b@pacbell.net> | 2008-02-26 03:01:23 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2008-04-14 12:57:06 -0400 |
commit | ac37a0b0ba7e8a6afce8db3f6c3367a3cfedad26 (patch) | |
tree | 18277a64c2662334c1ada7c721dc9daa2f6f4fbf /drivers/input/touchscreen | |
parent | 52e3134423c3af4431fedb34f77e31cfff91e0c3 (diff) |
ARM: OMAP: 5912 OSK GPIO updates
Start cleaning up GPIO handling for OMAP5912 OSK board:
- Initialize GPIOs using the cross-platform calls, not the old
OMAP-private ones.
- Move touchscreen setup out of ads7846 code into board-specfic
setup code, where it belongs.
This doesn't depend on the patches to update OMAP to use the
gpiolib implementation framework.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'drivers/input/touchscreen')
-rw-r--r-- | drivers/input/touchscreen/ads7846.c | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c index 57a1c28bf122..39573b91c8de 100644 --- a/drivers/input/touchscreen/ads7846.c +++ b/drivers/input/touchscreen/ads7846.c | |||
@@ -28,13 +28,6 @@ | |||
28 | #include <linux/spi/ads7846.h> | 28 | #include <linux/spi/ads7846.h> |
29 | #include <asm/irq.h> | 29 | #include <asm/irq.h> |
30 | 30 | ||
31 | #ifdef CONFIG_ARM | ||
32 | #include <asm/mach-types.h> | ||
33 | #ifdef CONFIG_ARCH_OMAP | ||
34 | #include <asm/arch/gpio.h> | ||
35 | #endif | ||
36 | #endif | ||
37 | |||
38 | 31 | ||
39 | /* | 32 | /* |
40 | * This code has been heavily tested on a Nokia 770, and lightly | 33 | * This code has been heavily tested on a Nokia 770, and lightly |
@@ -1174,31 +1167,6 @@ static struct spi_driver ads7846_driver = { | |||
1174 | 1167 | ||
1175 | static int __init ads7846_init(void) | 1168 | static int __init ads7846_init(void) |
1176 | { | 1169 | { |
1177 | /* grr, board-specific init should stay out of drivers!! */ | ||
1178 | |||
1179 | #ifdef CONFIG_ARCH_OMAP | ||
1180 | if (machine_is_omap_osk()) { | ||
1181 | /* GPIO4 = PENIRQ; GPIO6 = BUSY */ | ||
1182 | omap_request_gpio(4); | ||
1183 | omap_set_gpio_direction(4, 1); | ||
1184 | omap_request_gpio(6); | ||
1185 | omap_set_gpio_direction(6, 1); | ||
1186 | } | ||
1187 | // also TI 1510 Innovator, bitbanging through FPGA | ||
1188 | // also Nokia 770 | ||
1189 | // also Palm Tungsten T2 | ||
1190 | #endif | ||
1191 | |||
1192 | // PXA: | ||
1193 | // also Dell Axim X50 | ||
1194 | // also HP iPaq H191x/H192x/H415x/H435x | ||
1195 | // also Intel Lubbock (additional to UCB1400; as temperature sensor) | ||
1196 | // also Sharp Zaurus C7xx, C8xx (corgi/sheperd/husky) | ||
1197 | |||
1198 | // Atmel at91sam9261-EK uses ads7843 | ||
1199 | |||
1200 | // also various AMD Au1x00 devel boards | ||
1201 | |||
1202 | return spi_register_driver(&ads7846_driver); | 1170 | return spi_register_driver(&ads7846_driver); |
1203 | } | 1171 | } |
1204 | module_init(ads7846_init); | 1172 | module_init(ads7846_init); |
@@ -1206,14 +1174,6 @@ module_init(ads7846_init); | |||
1206 | static void __exit ads7846_exit(void) | 1174 | static void __exit ads7846_exit(void) |
1207 | { | 1175 | { |
1208 | spi_unregister_driver(&ads7846_driver); | 1176 | spi_unregister_driver(&ads7846_driver); |
1209 | |||
1210 | #ifdef CONFIG_ARCH_OMAP | ||
1211 | if (machine_is_omap_osk()) { | ||
1212 | omap_free_gpio(4); | ||
1213 | omap_free_gpio(6); | ||
1214 | } | ||
1215 | #endif | ||
1216 | |||
1217 | } | 1177 | } |
1218 | module_exit(ads7846_exit); | 1178 | module_exit(ads7846_exit); |
1219 | 1179 | ||