summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx
diff options
context:
space:
mode:
authorRichard Zhao <richard.zhao@linaro.org>2011-11-15 14:48:04 +0800
committerSascha Hauer <s.hauer@pengutronix.de>2012-02-01 14:29:30 +0100
commit8186064cfc143e6a103670731af75114ebfe1ba4 (patch)
treeac0c114cfe5451283856b44e9de0edc9f7d00ce8 /arch/arm/mach-imx
parentd816c6e644fd5b63fa7dbf865360db218753a212 (diff)
downloadblackbird-op-linux-8186064cfc143e6a103670731af75114ebfe1ba4.tar.gz
blackbird-op-linux-8186064cfc143e6a103670731af75114ebfe1ba4.zip
ARM: mx31moboard: add clk_prepare/clk_unprepare
It's for migrating to generic clk framework API. Signed-off-by: Richard Zhao <richard.zhao@linaro.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx')
-rw-r--r--arch/arm/mach-imx/mach-mx31moboard.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-mx31moboard.c b/arch/arm/mach-imx/mach-mx31moboard.c
index f225262b5c38..96e042d0c9a9 100644
--- a/arch/arm/mach-imx/mach-mx31moboard.c
+++ b/arch/arm/mach-imx/mach-mx31moboard.c
@@ -507,7 +507,7 @@ static void mx31moboard_poweroff(void)
struct clk *clk = clk_get_sys("imx2-wdt.0", NULL);
if (!IS_ERR(clk))
- clk_enable(clk);
+ clk_prepare_enable(clk);
mxc_iomux_mode(MX31_PIN_WATCHDOG_RST__WATCHDOG_RST);
OpenPOWER on IntegriCloud