diff options
author | David Brownell <dbrownell@users.sourceforge.net> | 2008-12-10 20:35:26 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2008-12-10 20:35:26 -0500 |
commit | e918edf7c2f2270dcf18cdcbdf86174a013a124e (patch) | |
tree | 36a5d45c3795ac188e32c09b427fa67068d6cacd /arch/arm/mach-omap1/board-voiceblue.c | |
parent | 40e3925ba15b604c9ff87154d77a914221d11cdc (diff) |
ARM: OMAP: switch to gpio_direction_output
More conversion to the standard GPIO interfaces: stop using
omap_set_gpio_direction() entirely, and switch over to the
gpio_direction_output() call.
Note that because gpio_direction_output() includes the initial
value, this change isn't quite transparent.
- For the call sites which defined an initial value either
before or after setting the direction, that value was used.
When that value was previously assigned afterwards, this
could eliminate a brief output glitch ... and possibly
change behavior. In a few cases (LCDs) several values
were assigned together ... those were re-arranged to match
the explicit sequence provided.
- Some call sites didn't define such a value; so I chose an
initial "off/reset" value that seemed to default to "off".
In short, files touched by this patch might notice some small
changes in startup behavior (with trivial fixes).
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1/board-voiceblue.c')
-rw-r--r-- | arch/arm/mach-omap1/board-voiceblue.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/arm/mach-omap1/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c index 86e73b7bffa9..43b008f639f5 100644 --- a/arch/arm/mach-omap1/board-voiceblue.c +++ b/arch/arm/mach-omap1/board-voiceblue.c | |||
@@ -171,8 +171,7 @@ static void __init voiceblue_init(void) | |||
171 | omap_request_gpio(0); | 171 | omap_request_gpio(0); |
172 | /* smc91x reset */ | 172 | /* smc91x reset */ |
173 | omap_request_gpio(7); | 173 | omap_request_gpio(7); |
174 | omap_set_gpio_direction(7, 0); | 174 | gpio_direction_output(7, 1); |
175 | gpio_set_value(7, 1); | ||
176 | udelay(2); /* wait at least 100ns */ | 175 | udelay(2); /* wait at least 100ns */ |
177 | gpio_set_value(7, 0); | 176 | gpio_set_value(7, 0); |
178 | mdelay(50); /* 50ms until PHY ready */ | 177 | mdelay(50); /* 50ms until PHY ready */ |
@@ -180,8 +179,7 @@ static void __init voiceblue_init(void) | |||
180 | omap_request_gpio(8); | 179 | omap_request_gpio(8); |
181 | /* 16C554 reset*/ | 180 | /* 16C554 reset*/ |
182 | omap_request_gpio(6); | 181 | omap_request_gpio(6); |
183 | omap_set_gpio_direction(6, 0); | 182 | gpio_direction_output(6, 0); |
184 | gpio_set_value(6, 0); | ||
185 | /* 16C554 interrupt pins */ | 183 | /* 16C554 interrupt pins */ |
186 | omap_request_gpio(12); | 184 | omap_request_gpio(12); |
187 | omap_request_gpio(13); | 185 | omap_request_gpio(13); |
@@ -244,8 +242,7 @@ static int wdt_gpio_state; | |||
244 | 242 | ||
245 | void voiceblue_wdt_enable(void) | 243 | void voiceblue_wdt_enable(void) |
246 | { | 244 | { |
247 | omap_set_gpio_direction(0, 0); | 245 | gpio_direction_output(0, 0); |
248 | gpio_set_value(0, 0); | ||
249 | gpio_set_value(0, 1); | 246 | gpio_set_value(0, 1); |
250 | gpio_set_value(0, 0); | 247 | gpio_set_value(0, 0); |
251 | wdt_gpio_state = 0; | 248 | wdt_gpio_state = 0; |