Merge branch 'cgroup-rmdir-updates' into cgroup/for-3.8

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-omap2 / board-h4.c

diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c
index f6c48dd764fe4ec60e26b60796b8383f74803a2a..8d04bf851af44e36568f4824a0d3cbb84760d566 100644 (file)
--- a/arch/arm/mach-omap2/board-h4.c
+++ b/arch/arm/mach-omap2/board-h4.c
@@ -265,9 +265,9 @@ static inline void __init h4_init_debug(void)
                return;
        }
 
-       clk_enable(gpmc_fck);
+       clk_prepare_enable(gpmc_fck);
        rate = clk_get_rate(gpmc_fck);
-       clk_disable(gpmc_fck);
+       clk_disable_unprepare(gpmc_fck);
        clk_put(gpmc_fck);
 
        if (is_gpmc_muxed())
@@ -311,7 +311,7 @@ static inline void __init h4_init_debug(void)
                gpmc_cs_free(eth_cs);
 
 out:
-       clk_disable(gpmc_fck);
+       clk_disable_unprepare(gpmc_fck);
        clk_put(gpmc_fck);
 }