diff options
| author | Olof Johansson <olof@lixom.net> | 2012-02-08 23:32:04 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-02-08 23:32:04 (GMT) |
| commit | ac819a86a76dc29d18306f5c998c38af1ebb58cd (patch) | |
| tree | c1d5b4280897edebdf8954b4290b26b105110c84 /arch/arm/mach-imx | |
| parent | 0180a7d012e413a956e3f46fcbeb8dbf3374a19c (diff) | |
| parent | 5ef97faa31ccf34d6fef0964aea3c924f9d534fe (diff) | |
| download | linux-fsl-qoriq-ac819a86a76dc29d18306f5c998c38af1ebb58cd.tar.xz | |
Merge branch 'features/imx-clk-prepare' of git://git.pengutronix.de/git/imx/linux-2.6 into next/drivers
* 'features/imx-clk-prepare' of git://git.pengutronix.de/git/imx/linux-2.6:
mmc: sdhci-esdhc-imx: add clk_prepare/clk_unprepare
i2c: imx: add clk_prepare/clk_unprepare
serial: imx: add clk_prepare/clk_unprepare
ARM: mx31moboard: add clk_prepare/clk_unprepare
ARM: pm-imx5: add clk_prepare/clk_unprepare
ARM: mxc: audmux-v2: add clk_prepare/clk_unprepare
ARM: mxc: arch_reset: add clk_prepare/clk_unprepare
ARM: mxc: epit: add clk_prepare/clk_unprepare
ARM: mxc: pwm: add clk_prepare/clk_unprepare
ARM: mxc: ahci: add clk_prepare/clk_unprepare
ARM: mxc: time: add clk_prepare/clk_unprepare
Diffstat (limited to 'arch/arm/mach-imx')
| -rw-r--r-- | arch/arm/mach-imx/mach-mx31moboard.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-imx/pm-imx5.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/mach-mx31moboard.c b/arch/arm/mach-imx/mach-mx31moboard.c index f225262..96e042d 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); diff --git a/arch/arm/mach-imx/pm-imx5.c b/arch/arm/mach-imx/pm-imx5.c index 6dc0934..e26a9cb 100644 --- a/arch/arm/mach-imx/pm-imx5.c +++ b/arch/arm/mach-imx/pm-imx5.c @@ -89,7 +89,7 @@ void mx5_cpu_lp_set(enum mxc_cpu_pwr_mode mode) static int mx5_suspend_prepare(void) { - return clk_enable(gpc_dvfs_clk); + return clk_prepare_enable(gpc_dvfs_clk); } static int mx5_suspend_enter(suspend_state_t state) @@ -119,7 +119,7 @@ static int mx5_suspend_enter(suspend_state_t state) static void mx5_suspend_finish(void) { - clk_disable(gpc_dvfs_clk); + clk_disable_unprepare(gpc_dvfs_clk); } static int mx5_pm_valid(suspend_state_t state) |