summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorChao Xie <chao.xie@marvell.com>2012-11-27 22:06:04 -0500
committerFelipe Balbi <balbi@ti.com>2012-12-13 11:58:45 +0200
commite3f1dbd21ddfaa22649b93212d5ac4b052c1e4a7 (patch)
tree8f33c8429f2860818dbcfaa785fd44ae8c629513 /drivers/usb
parente0b64ce6fe0a9d4ce8cf97fea7fe5ec7125dea30 (diff)
downloadlinux-stable-e3f1dbd21ddfaa22649b93212d5ac4b052c1e4a7.tar.gz
linux-stable-e3f1dbd21ddfaa22649b93212d5ac4b052c1e4a7.tar.bz2
linux-stable-e3f1dbd21ddfaa22649b93212d5ac4b052c1e4a7.zip
usb: otg: mv_otg: fix the clk APIs
the clock common driver changes, and arch-mmp will make use of the common clock driver instead of its own. So for enable clock. first prepare the clock then enable the clock. for disable clock first disable the clock then unprepare the clock Signed-off-by: Chao Xie <chao.xie@marvell.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/otg/mv_otg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/otg/mv_otg.c b/drivers/usb/otg/mv_otg.c
index 1dd57504186d..eace975991a8 100644
--- a/drivers/usb/otg/mv_otg.c
+++ b/drivers/usb/otg/mv_otg.c
@@ -240,7 +240,7 @@ static void otg_clock_enable(struct mv_otg *mvotg)
unsigned int i;
for (i = 0; i < mvotg->clknum; i++)
- clk_enable(mvotg->clk[i]);
+ clk_prepare_enable(mvotg->clk[i]);
}
static void otg_clock_disable(struct mv_otg *mvotg)
@@ -248,7 +248,7 @@ static void otg_clock_disable(struct mv_otg *mvotg)
unsigned int i;
for (i = 0; i < mvotg->clknum; i++)
- clk_disable(mvotg->clk[i]);
+ clk_disable_unprepare(mvotg->clk[i]);
}
static int mv_otg_enable_internal(struct mv_otg *mvotg)