diff options
| author | Roger Quadros <rogerq@ti.com> | 2013-10-15 15:30:34 +0300 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2013-10-23 16:22:25 +0100 |
| commit | b0e5992612a1079ddcc1810b786ab8ca438cddae (patch) | |
| tree | 68f303a71b3dd61f4c2f442f9e541137b6231a13 /drivers/mfd/omap-usb-tll.c | |
| parent | 2a048d3b787e154e06a21f5f0951a319b6ada4fb (diff) | |
| download | op-kernel-dev-b0e5992612a1079ddcc1810b786ab8ca438cddae.zip op-kernel-dev-b0e5992612a1079ddcc1810b786ab8ca438cddae.tar.gz | |
mfd: omap-usb: prepare/unprepare clock while enable/disable
This should fix the following warning at boot on OMAP5 uEVM
[ 8.783155] WARNING: CPU: 0 PID: 1 at drivers/clk/clk.c:883 __clk_enable+0x94/0xa4()
Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/omap-usb-tll.c')
| -rw-r--r-- | drivers/mfd/omap-usb-tll.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/omap-usb-tll.c b/drivers/mfd/omap-usb-tll.c index b8f6401..0d946ae1 100644 --- a/drivers/mfd/omap-usb-tll.c +++ b/drivers/mfd/omap-usb-tll.c @@ -429,7 +429,7 @@ int omap_tll_enable(struct usbhs_omap_platform_data *pdata) if (IS_ERR(tll->ch_clk[i])) continue; - r = clk_enable(tll->ch_clk[i]); + r = clk_prepare_enable(tll->ch_clk[i]); if (r) { dev_err(tll_dev, "Error enabling ch %d clock: %d\n", i, r); @@ -460,7 +460,7 @@ int omap_tll_disable(struct usbhs_omap_platform_data *pdata) for (i = 0; i < tll->nch; i++) { if (omap_usb_mode_needs_tll(pdata->port_mode[i])) { if (!IS_ERR(tll->ch_clk[i])) - clk_disable(tll->ch_clk[i]); + clk_disable_unprepare(tll->ch_clk[i]); } } |
