diff options
| author | Peter Chen <peter.chen@freescale.com> | 2010-07-30 16:08:41 +0800 |
|---|---|---|
| committer | Frank Li <Frank.Li@freescale.com> | 2010-08-05 14:56:09 +0800 |
| commit | c50028805e9d93bbfd87a6697d73ddea2b400355 (patch) | |
| tree | e76bcf79d63f839f1619bb973ab0625bd502116a | |
| parent | 2ff7fd2371f9726e762696a7ab2a6b4caf0850f8 (diff) | |
ENGR00125843 usb: Add clock disable to uninit function for mx23/mx28
1. Add clock disable to uninit function for mx23/mx28
2. The platform init function for usb module should execute
before module_init if the usb module is build-in.
Signed-off-by: Peter Chen <peter.chen@freescale.com>
(cherry picked from commit 370362d90b366d2f45ad211a3ccc5c6b2a019fec)
| -rw-r--r-- | arch/arm/mach-mx23/usb_dr.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mx28/usb_dr.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-mxs/usb_common.c | 10 | ||||
| -rw-r--r-- | arch/arm/plat-mxs/utmixc.c | 2 |
4 files changed, 13 insertions, 3 deletions
diff --git a/arch/arm/mach-mx23/usb_dr.c b/arch/arm/mach-mx23/usb_dr.c index ed4bde71391c..1ab8ed040303 100644 --- a/arch/arm/mach-mx23/usb_dr.c +++ b/arch/arm/mach-mx23/usb_dr.c @@ -167,5 +167,5 @@ void fsl_phy_set_power(struct fsl_xcvr_ops *this, #ifdef CONFIG_MXS_VBUS_CURRENT_DRAW fs_initcall(usb_dr_init); #else - module_init(usb_dr_init); + subsys_initcall(usb_dr_init); #endif diff --git a/arch/arm/mach-mx28/usb_dr.c b/arch/arm/mach-mx28/usb_dr.c index 13344ef0e26f..c815588b9b6d 100644 --- a/arch/arm/mach-mx28/usb_dr.c +++ b/arch/arm/mach-mx28/usb_dr.c @@ -156,5 +156,5 @@ void fsl_phy_set_power(struct fsl_xcvr_ops *this, #ifdef CONFIG_MXS_VBUS_CURRENT_DRAW fs_initcall(usb_dr_init); #else - module_init(usb_dr_init); + subsys_initcall(usb_dr_init); #endif diff --git a/arch/arm/plat-mxs/usb_common.c b/arch/arm/plat-mxs/usb_common.c index fa9466090e34..2294c08167e8 100644 --- a/arch/arm/plat-mxs/usb_common.c +++ b/arch/arm/plat-mxs/usb_common.c @@ -293,6 +293,7 @@ EXPORT_SYMBOL(usbotg_init); void usbotg_uninit(struct fsl_usb2_platform_data *pdata) { int tmp; + struct clk *usb_clk; pr_debug("%s\n", __func__); if (pdata->xcvr_ops && pdata->xcvr_ops->uninit) @@ -303,6 +304,10 @@ void usbotg_uninit(struct fsl_usb2_platform_data *pdata) tmp |= PORTSC_PHCD; __raw_writel(tmp, pdata->regs + UOG_PORTSC1); + usb_clk = clk_get(NULL, "usb_clk0"); + clk_disable(usb_clk); + clk_put(usb_clk); + pdata->regs = NULL; otg_used--; } @@ -341,11 +346,16 @@ EXPORT_SYMBOL(fsl_usb_host_init); void fsl_usb_host_uninit(struct fsl_usb2_platform_data *pdata) { + struct clk *usb_clk; pr_debug("%s\n", __func__); if (pdata->xcvr_ops && pdata->xcvr_ops->uninit) pdata->xcvr_ops->uninit(pdata->xcvr_ops); + usb_clk = clk_get(NULL, "usb_clk1"); + clk_disable(usb_clk); + clk_put(usb_clk); + pdata->regs = NULL; } EXPORT_SYMBOL(fsl_usb_host_uninit); diff --git a/arch/arm/plat-mxs/utmixc.c b/arch/arm/plat-mxs/utmixc.c index 8ad6bd4f3654..8e842840e87a 100644 --- a/arch/arm/plat-mxs/utmixc.c +++ b/arch/arm/plat-mxs/utmixc.c @@ -80,7 +80,7 @@ static void __exit utmixc_exit(void) #ifdef CONFIG_MXS_VBUS_CURRENT_DRAW fs_initcall(utmixc_init); #else - module_init(utmixc_init); + subsys_initcall(utmixc_init); #endif module_exit(utmixc_exit); |