lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

usb: fsl_mxc_udc.c : Use clk_prepare_enable/clk_disable_unprepare

Browse Source 
Prepare the clock before enabling it.

Cc: <linux-usb@vger.kernel.org>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
Fabio Estevam
2012-05-25 20:14:53 -03:00
committed by Felipe Balbi
parent b785ea7ce6
commit 1c7f6cd3f9
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/usb/gadget/fsl_mxc_udc.c
View File

@@ -40,7 +40,7 @@ int fsl_udc_clk_init(struct platform_device *pdev)
if (IS_ERR(mxc_ahb_clk)) if (IS_ERR(mxc_ahb_clk))
return PTR_ERR(mxc_ahb_clk); return PTR_ERR(mxc_ahb_clk);
ret = clk_enable(mxc_ahb_clk); ret = clk_prepare_enable(mxc_ahb_clk);
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "clk_enable(\"usb_ahb\") failed\n"); dev_err(&pdev->dev, "clk_enable(\"usb_ahb\") failed\n");
goto eenahb; goto eenahb;
@@ -65,7 +65,7 @@ int fsl_udc_clk_init(struct platform_device *pdev)
} }
} }
ret = clk_enable(mxc_usb_clk); ret = clk_prepare_enable(mxc_usb_clk);
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "clk_enable(\"usb_clk\") failed\n"); dev_err(&pdev->dev, "clk_enable(\"usb_clk\") failed\n");
goto eenusb; goto eenusb;
@@ -79,7 +79,7 @@ eclkrate:
mxc_usb_clk = NULL; mxc_usb_clk = NULL;
egusb: egusb:
if (!cpu_is_mx35()) if (!cpu_is_mx35())
clk_disable(mxc_ahb_clk); clk_disable_unprepare(mxc_ahb_clk);
eenahb: eenahb:
if (!cpu_is_mx35()) if (!cpu_is_mx35())
clk_put(mxc_ahb_clk); clk_put(mxc_ahb_clk);
@@ -104,7 +104,7 @@ void fsl_udc_clk_finalize(struct platform_device *pdev)
/* ULPI transceivers don't need usbpll */ /* ULPI transceivers don't need usbpll */
if (pdata->phy_mode == FSL_USB2_PHY_ULPI) { if (pdata->phy_mode == FSL_USB2_PHY_ULPI) {
clk_disable(mxc_usb_clk); clk_disable_unprepare(mxc_usb_clk);
clk_put(mxc_usb_clk); clk_put(mxc_usb_clk);
mxc_usb_clk = NULL; mxc_usb_clk = NULL;
} }
@@ -113,11 +113,11 @@ void fsl_udc_clk_finalize(struct platform_device *pdev)
void fsl_udc_clk_release(void) void fsl_udc_clk_release(void)
{ {
if (mxc_usb_clk) { if (mxc_usb_clk) {
clk_disable(mxc_usb_clk); clk_disable_unprepare(mxc_usb_clk);
clk_put(mxc_usb_clk); clk_put(mxc_usb_clk);
} }
if (!cpu_is_mx35()) { if (!cpu_is_mx35()) {
clk_disable(mxc_ahb_clk); clk_disable_unprepare(mxc_ahb_clk);
clk_put(mxc_ahb_clk); clk_put(mxc_ahb_clk);
} }
} }