From: Jarkko Nikula Date: Fri, 31 Oct 2008 12:18:49 +0000 (+0200) Subject: USB: EHCI-OMAP: Switch to gpio_request/free calls X-Git-Tag: v2.6.28-omap1~132 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=83d8005fa0f4fe3d49190631fc4aee51ae9c971f;p=linux-2.6-omap-h63xx.git USB: EHCI-OMAP: Switch to gpio_request/free calls Signed-off-by: Jarkko Nikula Signed-off-by: Tony Lindgren --- diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c index 4dffba6fc60..1b3266cf606 100644 --- a/drivers/usb/host/ehci-omap.c +++ b/drivers/usb/host/ehci-omap.c @@ -225,9 +225,9 @@ static int omap_start_ehc(struct platform_device *dev, struct usb_hcd *hcd) #ifdef EXTERNAL_PHY_RESET /* Refer: ISSUE1 */ - omap_request_gpio(EXT_PHY_RESET_GPIO_PORT1); + gpio_request(EXT_PHY_RESET_GPIO_PORT1, "USB1 PHY reset"); gpio_direction_output(EXT_PHY_RESET_GPIO_PORT1, 0); - omap_request_gpio(EXT_PHY_RESET_GPIO_PORT2); + gpio_request(EXT_PHY_RESET_GPIO_PORT2, "USB2 PHY reset"); gpio_direction_output(EXT_PHY_RESET_GPIO_PORT2, 0); /* Hold the PHY in RESET for enough time till DIR is high */ udelay(EXT_PHY_RESET_DELAY); @@ -393,8 +393,8 @@ static void omap_stop_ehc(struct platform_device *dev, struct usb_hcd *hcd) #ifdef EXTERNAL_PHY_RESET - omap_free_gpio(EXT_PHY_RESET_GPIO_PORT1); - omap_free_gpio(EXT_PHY_RESET_GPIO_PORT2); + gpio_free(EXT_PHY_RESET_GPIO_PORT1); + gpio_free(EXT_PHY_RESET_GPIO_PORT2); #endif dev_dbg(hcd->self.controller,