summaryrefslogtreecommitdiff
path: root/drivers/usb/host
diff options
context:
space:
mode:
authorChao Xie <chao.xie@marvell.com>2012-11-27 22:06:05 -0500
committerFelipe Balbi <balbi@ti.com>2012-12-13 11:58:41 +0200
commitc1a96ebd315f82fa0f47adce264adb126cf72764 (patch)
tree467c4b41ffd168c083ba5f77e12ea07da47a2510 /drivers/usb/host
parente887786a466f36720fde5d4a1bc3c7dacd400bd1 (diff)
downloadlinux-3.10-c1a96ebd315f82fa0f47adce264adb126cf72764.tar.gz
linux-3.10-c1a96ebd315f82fa0f47adce264adb126cf72764.tar.bz2
linux-3.10-c1a96ebd315f82fa0f47adce264adb126cf72764.zip
usb: host: ehci-mv: fix 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> Acked-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/host')
-rw-r--r--drivers/usb/host/ehci-mv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/ehci-mv.c b/drivers/usb/host/ehci-mv.c
index f7bfc0b898b..6c56297ea16 100644
--- a/drivers/usb/host/ehci-mv.c
+++ b/drivers/usb/host/ehci-mv.c
@@ -43,7 +43,7 @@ static void ehci_clock_enable(struct ehci_hcd_mv *ehci_mv)
unsigned int i;
for (i = 0; i < ehci_mv->clknum; i++)
- clk_enable(ehci_mv->clk[i]);
+ clk_prepare_enable(ehci_mv->clk[i]);
}
static void ehci_clock_disable(struct ehci_hcd_mv *ehci_mv)
@@ -51,7 +51,7 @@ static void ehci_clock_disable(struct ehci_hcd_mv *ehci_mv)
unsigned int i;
for (i = 0; i < ehci_mv->clknum; i++)
- clk_disable(ehci_mv->clk[i]);
+ clk_disable_unprepare(ehci_mv->clk[i]);
}
static int mv_ehci_enable(struct ehci_hcd_mv *ehci_mv)