aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1/board-voiceblue.c
diff options
context:
space:
mode:
authorDavid Brownell <dbrownell@users.sourceforge.net>2008-12-10 20:35:25 -0500
committerTony Lindgren <tony@atomide.com>2008-12-10 20:35:25 -0500
commit0b84b5ca43a9c86cfad848c135fdbf7c72af68fa (patch)
tree9eb6f9cfb74c245bdb68be9c8814778ddc2ff1f4 /arch/arm/mach-omap1/board-voiceblue.c
parenta007b7096feea2d865ad3e7177eb8be34041bef9 (diff)
ARM: OMAP: switch to standard gpio get/set calls
This patch replaces some legacy OMAP GPIO calls with the "new" (not really, any more!) calls that work on most platforms. The calls addressed by this patch are the simple ones to get and set values ... for code that's in mainline, including the implementations of those calls. Except for the declarations and definitions of those calls, all of these changes were performed by a simple SED script. Plus, a few "if() set() else set()" branches were merged by hand. 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.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/mach-omap1/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c
index 45a01311669a..d7ab11acc7eb 100644
--- a/arch/arm/mach-omap1/board-voiceblue.c
+++ b/arch/arm/mach-omap1/board-voiceblue.c
@@ -172,16 +172,16 @@ static void __init voiceblue_init(void)
172 /* smc91x reset */ 172 /* smc91x reset */
173 omap_request_gpio(7); 173 omap_request_gpio(7);
174 omap_set_gpio_direction(7, 0); 174 omap_set_gpio_direction(7, 0);
175 omap_set_gpio_dataout(7, 1); 175 gpio_set_value(7, 1);
176 udelay(2); /* wait at least 100ns */ 176 udelay(2); /* wait at least 100ns */
177 omap_set_gpio_dataout(7, 0); 177 gpio_set_value(7, 0);
178 mdelay(50); /* 50ms until PHY ready */ 178 mdelay(50); /* 50ms until PHY ready */
179 /* smc91x interrupt pin */ 179 /* smc91x interrupt pin */
180 omap_request_gpio(8); 180 omap_request_gpio(8);
181 /* 16C554 reset*/ 181 /* 16C554 reset*/
182 omap_request_gpio(6); 182 omap_request_gpio(6);
183 omap_set_gpio_direction(6, 0); 183 omap_set_gpio_direction(6, 0);
184 omap_set_gpio_dataout(6, 0); 184 gpio_set_value(6, 0);
185 /* 16C554 interrupt pins */ 185 /* 16C554 interrupt pins */
186 omap_request_gpio(12); 186 omap_request_gpio(12);
187 omap_request_gpio(13); 187 omap_request_gpio(13);
@@ -245,17 +245,17 @@ static int wdt_gpio_state;
245void voiceblue_wdt_enable(void) 245void voiceblue_wdt_enable(void)
246{ 246{
247 omap_set_gpio_direction(0, 0); 247 omap_set_gpio_direction(0, 0);
248 omap_set_gpio_dataout(0, 0); 248 gpio_set_value(0, 0);
249 omap_set_gpio_dataout(0, 1); 249 gpio_set_value(0, 1);
250 omap_set_gpio_dataout(0, 0); 250 gpio_set_value(0, 0);
251 wdt_gpio_state = 0; 251 wdt_gpio_state = 0;
252} 252}
253 253
254void voiceblue_wdt_disable(void) 254void voiceblue_wdt_disable(void)
255{ 255{
256 omap_set_gpio_dataout(0, 0); 256 gpio_set_value(0, 0);
257 omap_set_gpio_dataout(0, 1); 257 gpio_set_value(0, 1);
258 omap_set_gpio_dataout(0, 0); 258 gpio_set_value(0, 0);
259 omap_set_gpio_direction(0, 1); 259 omap_set_gpio_direction(0, 1);
260} 260}
261 261
@@ -265,7 +265,7 @@ void voiceblue_wdt_ping(void)
265 return; 265 return;
266 266
267 wdt_gpio_state = !wdt_gpio_state; 267 wdt_gpio_state = !wdt_gpio_state;
268 omap_set_gpio_dataout(0, wdt_gpio_state); 268 gpio_set_value(0, wdt_gpio_state);
269} 269}
270 270
271void voiceblue_reset(void) 271void voiceblue_reset(void)