diff options
| author | Peter Chen <peter.chen@freescale.com> | 2013-04-16 14:37:41 +0800 |
|---|---|---|
| committer | Peter Chen <peter.chen@freescale.com> | 2013-04-24 14:08:57 +0800 |
| commit | 9b2fd62ee4e8df34bfedc87646c149d7886fa4a2 (patch) | |
| tree | 34d941bcda3ce19e9367c48401583f7e8a9a65fe | |
| parent | 69a9d0b4f530d956557b5f459d6c7f146faa6ae9 (diff) | |
ENGR00258491-4 msl-mx6: usb: fix clock unmatch problem after unload module
Move clock disable from MSL to driver
Signed-off-by: Peter Chen <peter.chen@freescale.com>
| -rw-r--r-- | arch/arm/mach-mx6/usb_dr.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-mx6/usb_h1.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-mx6/usb_h2.c | 7 | ||||
| -rw-r--r-- | arch/arm/mach-mx6/usb_h3.c | 7 |
4 files changed, 2 insertions, 16 deletions
diff --git a/arch/arm/mach-mx6/usb_dr.c b/arch/arm/mach-mx6/usb_dr.c index e3f8fc8b3e6c..b7b0bee153c5 100644 --- a/arch/arm/mach-mx6/usb_dr.c +++ b/arch/arm/mach-mx6/usb_dr.c @@ -174,10 +174,7 @@ static void usbotg_uninit_ext(struct platform_device *pdev) { otg_used--; if (!otg_used) { - clk_disable(usb_phy1_clk); clk_put(usb_phy1_clk); - - clk_disable(usb_oh3_clk); clk_put(usb_oh3_clk); } } diff --git a/arch/arm/mach-mx6/usb_h1.c b/arch/arm/mach-mx6/usb_h1.c index 68b9ea1ded55..96a333eafbb9 100644 --- a/arch/arm/mach-mx6/usb_h1.c +++ b/arch/arm/mach-mx6/usb_h1.c @@ -172,7 +172,6 @@ static void fsl_usb_host_uninit_ext(struct platform_device *pdev) fsl_usb_host_uninit(pdata); - clk_disable(usb_oh3_clk); clk_put(usb_oh3_clk); } diff --git a/arch/arm/mach-mx6/usb_h2.c b/arch/arm/mach-mx6/usb_h2.c index be092ab8c97c..6ce99abafa41 100644 --- a/arch/arm/mach-mx6/usb_h2.c +++ b/arch/arm/mach-mx6/usb_h2.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2012 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -89,12 +89,7 @@ static void fsl_usb_host_uninit_ext(struct platform_device *pdev) fsl_usb_host_uninit(pdata); - usbh2_internal_phy_clock_gate(false); - - clk_disable(usb_phy3_clk); clk_put(usb_phy3_clk); - - clk_disable(usb_oh3_clk); clk_put(usb_oh3_clk); } diff --git a/arch/arm/mach-mx6/usb_h3.c b/arch/arm/mach-mx6/usb_h3.c index e25c01621b52..cddf55244098 100644 --- a/arch/arm/mach-mx6/usb_h3.c +++ b/arch/arm/mach-mx6/usb_h3.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2012 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -89,12 +89,7 @@ static void fsl_usb_host_uninit_ext(struct platform_device *pdev) fsl_usb_host_uninit(pdata); - usbh3_internal_phy_clock_gate(false); - - clk_disable(usb_phy4_clk); clk_put(usb_phy4_clk); - - clk_disable(usb_oh3_clk); clk_put(usb_oh3_clk); } |