aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-03-07 14:58:21 -0500
committerSascha Hauer <s.hauer@pengutronix.de>2012-04-25 11:03:40 -0400
commit198ad2cecde16ce309a65f2fddd5f6d3442f8250 (patch)
tree9e1ca9a8f299ce65814fa4739f18189fb977aaa1 /drivers
parent97c3213fd9fc28c0e86b69df09f4228424cafecc (diff)
USB ehci mxc: prepare/unprepare clock
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
-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)
171 ret = PTR_ERR(priv->usbclk); 171 ret = PTR_ERR(priv->usbclk);
172 goto err_clk; 172 goto err_clk;
173 } 173 }
174 clk_enable(priv->usbclk); 174 clk_prepare_enable(priv->usbclk);
175 175
176 if (!cpu_is_mx35() && !cpu_is_mx25()) { 176 if (!cpu_is_mx35() && !cpu_is_mx25()) {
177 priv->ahbclk = clk_get(dev, "usb_ahb"); 177 priv->ahbclk = clk_get(dev, "usb_ahb");
@@ -179,7 +179,7 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev)
179 ret = PTR_ERR(priv->ahbclk); 179 ret = PTR_ERR(priv->ahbclk);
180 goto err_clk_ahb; 180 goto err_clk_ahb;
181 } 181 }
182 clk_enable(priv->ahbclk); 182 clk_prepare_enable(priv->ahbclk);
183 } 183 }
184 184
185 /* "dr" device has its own clock on i.MX51 */ 185 /* "dr" device has its own clock on i.MX51 */
@@ -189,7 +189,7 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev)
189 ret = PTR_ERR(priv->phy1clk); 189 ret = PTR_ERR(priv->phy1clk);
190 goto err_clk_phy; 190 goto err_clk_phy;
191 } 191 }
192 clk_enable(priv->phy1clk); 192 clk_prepare_enable(priv->phy1clk);
193 } 193 }
194 194
195 195
@@ -266,16 +266,16 @@ err_add:
266 pdata->exit(pdev); 266 pdata->exit(pdev);
267err_init: 267err_init:
268 if (priv->phy1clk) { 268 if (priv->phy1clk) {
269 clk_disable(priv->phy1clk); 269 clk_disable_unprepare(priv->phy1clk);
270 clk_put(priv->phy1clk); 270 clk_put(priv->phy1clk);
271 } 271 }
272err_clk_phy: 272err_clk_phy:
273 if (priv->ahbclk) { 273 if (priv->ahbclk) {
274 clk_disable(priv->ahbclk); 274 clk_disable_unprepare(priv->ahbclk);
275 clk_put(priv->ahbclk); 275 clk_put(priv->ahbclk);
276 } 276 }
277err_clk_ahb: 277err_clk_ahb:
278 clk_disable(priv->usbclk); 278 clk_disable_unprepare(priv->usbclk);
279 clk_put(priv->usbclk); 279 clk_put(priv->usbclk);
280err_clk: 280err_clk:
281 iounmap(hcd->regs); 281 iounmap(hcd->regs);
@@ -307,14 +307,14 @@ static int __exit ehci_mxc_drv_remove(struct platform_device *pdev)
307 usb_put_hcd(hcd); 307 usb_put_hcd(hcd);
308 platform_set_drvdata(pdev, NULL); 308 platform_set_drvdata(pdev, NULL);
309 309
310 clk_disable(priv->usbclk); 310 clk_disable_unprepare(priv->usbclk);
311 clk_put(priv->usbclk); 311 clk_put(priv->usbclk);
312 if (priv->ahbclk) { 312 if (priv->ahbclk) {
313 clk_disable(priv->ahbclk); 313 clk_disable_unprepare(priv->ahbclk);
314 clk_put(priv->ahbclk); 314 clk_put(priv->ahbclk);
315 } 315 }
316 if (priv->phy1clk) { 316 if (priv->phy1clk) {
317 clk_disable(priv->phy1clk); 317 clk_disable_unprepare(priv->phy1clk);
318 clk_put(priv->phy1clk); 318 clk_put(priv->phy1clk);
319 } 319 }
320 320