summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-03-07 20:58:21 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2012-04-25 17:03:40 +0200
commit198ad2cecde16ce309a65f2fddd5f6d3442f8250 (patch)
tree9e1ca9a8f299ce65814fa4739f18189fb977aaa1 /drivers/usb
parent97c3213fd9fc28c0e86b69df09f4228424cafecc (diff)
downloadlinux-198ad2cecde16ce309a65f2fddd5f6d3442f8250.tar.gz
linux-198ad2cecde16ce309a65f2fddd5f6d3442f8250.tar.bz2
linux-198ad2cecde16ce309a65f2fddd5f6d3442f8250.zip
USB ehci mxc: prepare/unprepare clock
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/host/ehci-mxc.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c
index a797d51ecbe8..ae16c346389c 100644
--- a/drivers/usb/host/ehci-mxc.c
+++ b/drivers/usb/host/ehci-mxc.c
@@ -171,7 +171,7 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev)
ret = PTR_ERR(priv->usbclk);
goto err_clk;
}
- clk_enable(priv->usbclk);
+ clk_prepare_enable(priv->usbclk);
if (!cpu_is_mx35() && !cpu_is_mx25()) {
priv->ahbclk = clk_get(dev, "usb_ahb");
@@ -179,7 +179,7 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev)
ret = PTR_ERR(priv->ahbclk);
goto err_clk_ahb;
}
- clk_enable(priv->ahbclk);
+ clk_prepare_enable(priv->ahbclk);
}
/* "dr" device has its own clock on i.MX51 */
@@ -189,7 +189,7 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev)
ret = PTR_ERR(priv->phy1clk);
goto err_clk_phy;
}
- clk_enable(priv->phy1clk);
+ clk_prepare_enable(priv->phy1clk);
}
@@ -266,16 +266,16 @@ err_add:
pdata->exit(pdev);
err_init:
if (priv->phy1clk) {
- clk_disable(priv->phy1clk);
+ clk_disable_unprepare(priv->phy1clk);
clk_put(priv->phy1clk);
}
err_clk_phy:
if (priv->ahbclk) {
- clk_disable(priv->ahbclk);
+ clk_disable_unprepare(priv->ahbclk);
clk_put(priv->ahbclk);
}
err_clk_ahb:
- clk_disable(priv->usbclk);
+ clk_disable_unprepare(priv->usbclk);
clk_put(priv->usbclk);
err_clk:
iounmap(hcd->regs);
@@ -307,14 +307,14 @@ static int __exit ehci_mxc_drv_remove(struct platform_device *pdev)
usb_put_hcd(hcd);
platform_set_drvdata(pdev, NULL);
- clk_disable(priv->usbclk);
+ clk_disable_unprepare(priv->usbclk);
clk_put(priv->usbclk);
if (priv->ahbclk) {
- clk_disable(priv->ahbclk);
+ clk_disable_unprepare(priv->ahbclk);
clk_put(priv->ahbclk);
}
if (priv->phy1clk) {
- clk_disable(priv->phy1clk);
+ clk_disable_unprepare(priv->phy1clk);
clk_put(priv->phy1clk);
}