Merge branch 'omap-clock-fixes' of git://git.pwsan.com/linux-2.6

[linux-2.6-omap-h63xx.git] / arch / arm / plat-omap / debug-leds.c

diff --git a/arch/arm/plat-omap/debug-leds.c b/arch/arm/plat-omap/debug-leds.c
index 2f4c0cabfd341fbaa2d54e0fba2673c8d0ec383b..be4eefda4767fa11f54177bb6ba8a3a1ed27d770 100644 (file)
--- a/arch/arm/plat-omap/debug-leds.c
+++ b/arch/arm/plat-omap/debug-leds.c
@@ -83,8 +83,8 @@ static void h2p2_dbg_leds_event(led_event_t evt)
                /* all leds off during suspend or shutdown */
 
                if (!(machine_is_omap_perseus2() || machine_is_omap_h4())) {
-                       omap_set_gpio_dataout(GPIO_TIMER, 0);
-                       omap_set_gpio_dataout(GPIO_IDLE, 0);
+                       gpio_set_value(GPIO_TIMER, 0);
+                       gpio_set_value(GPIO_IDLE, 0);
                }
 
                __raw_writew(~0, &fpga->leds);
@@ -107,7 +107,7 @@ static void h2p2_dbg_leds_event(led_event_t evt)
                if (machine_is_omap_perseus2() || machine_is_omap_h4())
                        hw_led_state ^= H2P2_DBG_FPGA_P2_LED_TIMER;
                else {
-                       omap_set_gpio_dataout(GPIO_TIMER,
+                       gpio_set_value(GPIO_TIMER,
                                        led_state & LED_TIMER_ON);
                        goto done;
                }
@@ -121,7 +121,7 @@ static void h2p2_dbg_leds_event(led_event_t evt)
                if (machine_is_omap_perseus2() || machine_is_omap_h4())
                        hw_led_state &= ~H2P2_DBG_FPGA_P2_LED_IDLE;
                else {
-                       omap_set_gpio_dataout(GPIO_IDLE, 1);
+                       gpio_set_value(GPIO_IDLE, 1);
                        goto done;
                }
 
@@ -131,7 +131,7 @@ static void h2p2_dbg_leds_event(led_event_t evt)
                if (machine_is_omap_perseus2() || machine_is_omap_h4())
                        hw_led_state |= H2P2_DBG_FPGA_P2_LED_IDLE;
                else {
-                       omap_set_gpio_dataout(GPIO_IDLE, 0);
+                       gpio_set_value(GPIO_IDLE, 0);
                        goto done;
                }