From 8a7585d11087841f43c8dcffe1dbfe834d4ff782 Mon Sep 17 00:00:00 2001 From: Keshava Munegowda Date: Mon, 16 May 2011 14:24:58 +0530 Subject: [PATCH] --- yaml --- r: 251951 b: refs/heads/master c: 6eb6fbbf3eca6dfba73e72de5ab2eeb52ae41f7a h: refs/heads/master i: 251949: 38bcd38b7a7ff69a0b2281ef1a3f80f2256af013 251947: ad948afe5718f8061221e473bcca9fd2013f6736 251943: f1f4126cf94b10ffb4bd0e1ee91fe3d7eef98c8f 251935: 8c593b6d7996919f723ffb3130b32e8b056a50a0 v: v3 --- [refs] | 2 +- trunk/drivers/mfd/omap-usb-host.c | 27 +++++++++++++++++++-------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index b983106d25ff..bbe7b5d4d4fd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 13ca4f66108188231f9ef0358449f4543a0b84a1 +refs/heads/master: 6eb6fbbf3eca6dfba73e72de5ab2eeb52ae41f7a diff --git a/trunk/drivers/mfd/omap-usb-host.c b/trunk/drivers/mfd/omap-usb-host.c index 3ab9ffa00aad..55c5d4732f5f 100644 --- a/trunk/drivers/mfd/omap-usb-host.c +++ b/trunk/drivers/mfd/omap-usb-host.c @@ -994,22 +994,33 @@ static void usbhs_disable(struct device *dev) dev_dbg(dev, "operation timed out\n"); } - if (pdata->ehci_data->phy_reset) { - if (gpio_is_valid(pdata->ehci_data->reset_gpio_port[0])) - gpio_free(pdata->ehci_data->reset_gpio_port[0]); - - if (gpio_is_valid(pdata->ehci_data->reset_gpio_port[1])) - gpio_free(pdata->ehci_data->reset_gpio_port[1]); + if (is_omap_usbhs_rev2(omap)) { + if (is_ehci_tll_mode(pdata->port_mode[0])) + clk_enable(omap->usbtll_p1_fck); + if (is_ehci_tll_mode(pdata->port_mode[1])) + clk_enable(omap->usbtll_p2_fck); + clk_disable(omap->utmi_p2_fck); + clk_disable(omap->utmi_p1_fck); } - clk_disable(omap->utmi_p2_fck); - clk_disable(omap->utmi_p1_fck); clk_disable(omap->usbtll_ick); clk_disable(omap->usbtll_fck); clk_disable(omap->usbhost_fs_fck); clk_disable(omap->usbhost_hs_fck); clk_disable(omap->usbhost_ick); + /* The gpio_free migh sleep; so unlock the spinlock */ + spin_unlock_irqrestore(&omap->lock, flags); + + if (pdata->ehci_data->phy_reset) { + if (gpio_is_valid(pdata->ehci_data->reset_gpio_port[0])) + gpio_free(pdata->ehci_data->reset_gpio_port[0]); + + if (gpio_is_valid(pdata->ehci_data->reset_gpio_port[1])) + gpio_free(pdata->ehci_data->reset_gpio_port[1]); + } + return; + end_disble: spin_unlock_irqrestore(&omap->lock, flags); }