diff options
Diffstat (limited to 'drivers/mfd')
-rw-r--r-- | drivers/mfd/omap-usb-host.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c index 86e14583a082..6533ecc71678 100644 --- a/drivers/mfd/omap-usb-host.c +++ b/drivers/mfd/omap-usb-host.c | |||
@@ -715,19 +715,13 @@ static int usbhs_enable(struct device *dev) | |||
715 | clk_enable(omap->usbtll_ick); | 715 | clk_enable(omap->usbtll_ick); |
716 | 716 | ||
717 | if (pdata->ehci_data->phy_reset) { | 717 | if (pdata->ehci_data->phy_reset) { |
718 | if (gpio_is_valid(pdata->ehci_data->reset_gpio_port[0])) { | 718 | if (gpio_is_valid(pdata->ehci_data->reset_gpio_port[0])) |
719 | gpio_request(pdata->ehci_data->reset_gpio_port[0], | 719 | gpio_request_one(pdata->ehci_data->reset_gpio_port[0], |
720 | "USB1 PHY reset"); | 720 | GPIOF_OUT_INIT_LOW, "USB1 PHY reset"); |
721 | gpio_direction_output | ||
722 | (pdata->ehci_data->reset_gpio_port[0], 0); | ||
723 | } | ||
724 | 721 | ||
725 | if (gpio_is_valid(pdata->ehci_data->reset_gpio_port[1])) { | 722 | if (gpio_is_valid(pdata->ehci_data->reset_gpio_port[1])) |
726 | gpio_request(pdata->ehci_data->reset_gpio_port[1], | 723 | gpio_request_one(pdata->ehci_data->reset_gpio_port[1], |
727 | "USB2 PHY reset"); | 724 | GPIOF_OUT_INIT_LOW, "USB2 PHY reset"); |
728 | gpio_direction_output | ||
729 | (pdata->ehci_data->reset_gpio_port[1], 0); | ||
730 | } | ||
731 | 725 | ||
732 | /* Hold the PHY in RESET for enough time till DIR is high */ | 726 | /* Hold the PHY in RESET for enough time till DIR is high */ |
733 | udelay(10); | 727 | udelay(10); |