ARM: OMAP: Partial revert for EAC IO address changes

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / board-n800-usb.c

diff --git a/arch/arm/mach-omap2/board-n800-usb.c b/arch/arm/mach-omap2/board-n800-usb.c
index 5ab453dba25335d58074a1775ed9331eee7ffbbb..8250014bee6bdab7af34e23124e2896ed66010c2 100644 (file)
--- a/arch/arm/mach-omap2/board-n800-usb.c
+++ b/arch/arm/mach-omap2/board-n800-usb.c
@@ -14,9 +14,9 @@
 #include <linux/platform_device.h>
 #include <linux/clk.h>
 #include <linux/err.h>
+#include <linux/gpio.h>
 #include <linux/usb/musb.h>
 #include <mach/gpmc.h>
-#include <mach/gpio.h>
 #include <mach/pm.h>
 
 #define TUSB_ASYNC_CS          1
@@ -129,7 +129,7 @@ static int tusb_set_clock(struct clk *osc_ck, int state)
                if (osc_ck_on > 0)
                        return -ENODEV;
 
-               omap2_block_sleep();
+               //omap2_block_sleep();
                clk_enable(osc_ck);
                osc_ck_on = 1;
        } else {
@@ -138,7 +138,7 @@ static int tusb_set_clock(struct clk *osc_ck, int state)
 
                clk_disable(osc_ck);
                osc_ck_on = 0;
-               omap2_allow_sleep();
+               //omap2_allow_sleep();
        }
 
        return 0;
@@ -150,7 +150,7 @@ void __init n800_usb_init(void)
        static char     announce[] __initdata = KERN_INFO "TUSB 6010\n";
 
        /* PM companion chip power control pin */
-       ret = omap_request_gpio(GPIO_TUSB_ENABLE);
+       ret = gpio_request(GPIO_TUSB_ENABLE, "TUSB6010 enable");
        if (ret != 0) {
                printk(KERN_ERR "Could not get TUSB power GPIO%i\n",
                       GPIO_TUSB_ENABLE);
@@ -171,5 +171,5 @@ void __init n800_usb_init(void)
        return;
 
 err:
-       omap_free_gpio(GPIO_TUSB_ENABLE);
+       gpio_free(GPIO_TUSB_ENABLE);
 }