summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-mx5/usb_dr.c2
-rw-r--r--arch/arm/mach-mx5/usb_h1.c9
-rw-r--r--arch/arm/mach-mx5/usb_h2.c8
-rw-r--r--arch/arm/plat-mxc/usb_common.c6
4 files changed, 9 insertions, 16 deletions
diff --git a/arch/arm/mach-mx5/usb_dr.c b/arch/arm/mach-mx5/usb_dr.c
index 183a78228987..30eb79969d1d 100644
--- a/arch/arm/mach-mx5/usb_dr.c
+++ b/arch/arm/mach-mx5/usb_dr.c
@@ -225,7 +225,7 @@ static void host_wakeup_handler(struct fsl_usb2_platform_data *pdata)
{
_host_wakeup_enable(pdata, false);
_host_phy_lowpower_suspend(pdata, false);
- fsl_usb_recover_hcd(&mxc_usbdr_host_device);
+ pdata->wakeup_event = 1;
}
/* End of host related operation for DR port */
#endif /* CONFIG_USB_EHCI_ARC_OTG */
diff --git a/arch/arm/mach-mx5/usb_h1.c b/arch/arm/mach-mx5/usb_h1.c
index 197947cfcb3c..01795672c2c8 100644
--- a/arch/arm/mach-mx5/usb_h1.c
+++ b/arch/arm/mach-mx5/usb_h1.c
@@ -28,13 +28,6 @@ static struct clk *usb_phy2_clk;
static struct clk *usb_oh3_clk;
static struct clk *usb_ahb_clk;
extern int clk_get_usecount(struct clk *clk);
-
-#ifdef CONFIG_USB_EHCI_ARC
-extern void fsl_usb_recover_hcd(struct platform_device *pdev);
-#else
-static void fsl_usb_recover_hcd(struct platform_device *pdev)
-{; }
-#endif
/*
* USB Host1 HS port
*/
@@ -127,7 +120,7 @@ static void h1_wakeup_handler(struct fsl_usb2_platform_data *pdata)
{
_wake_up_enable(pdata, false);
_phy_lowpower_suspend(pdata, false);
- fsl_usb_recover_hcd(&mxc_usbh1_device);
+ pdata->wakeup_event = 1;
}
static void usbh1_wakeup_event_clear(void)
diff --git a/arch/arm/mach-mx5/usb_h2.c b/arch/arm/mach-mx5/usb_h2.c
index 516c62dea814..4ba29774b312 100644
--- a/arch/arm/mach-mx5/usb_h2.c
+++ b/arch/arm/mach-mx5/usb_h2.c
@@ -22,12 +22,6 @@
#include "iomux.h"
#include "mx51_pins.h"
-#ifdef CONFIG_USB_EHCI_ARC
-extern void fsl_usb_recover_hcd(struct platform_device *pdev);
-#else
-static void fsl_usb_recover_hcd(struct platform_device *pdev)
-{; }
-#endif
/*
* USB Host2 HS port
*/
@@ -109,7 +103,7 @@ static void h2_wakeup_handler(struct fsl_usb2_platform_data *pdata)
{
_wake_up_enable(pdata, false);
_phy_lowpower_suspend(pdata, false);
- fsl_usb_recover_hcd(&mxc_usbh2_device);
+ pdata->wakeup_event = 1;
}
static void usbh2_wakeup_event_clear(void)
diff --git a/arch/arm/plat-mxc/usb_common.c b/arch/arm/plat-mxc/usb_common.c
index 69cbcfc01d6f..cd382f2bb627 100644
--- a/arch/arm/plat-mxc/usb_common.c
+++ b/arch/arm/plat-mxc/usb_common.c
@@ -868,6 +868,12 @@ void usbotg_uninit(struct fsl_usb2_platform_data *pdata)
if (pdata->xcvr_type == PORTSC_PTS_SERIAL)
clk_disable(usb_clk);
clk_disable(usb_ahb_clk);
+ /* FIXME workaround for clock refcounf when load/unload usb module
+ * Need to fix it in future
+ */
+ #ifdef CONFIG_USB_OTG
+ clk_disable(usb_ahb_clk);
+ #endif
}
}
EXPORT_SYMBOL(usbotg_uninit);