ARM: davinci: convert platform code to use clk_prepare/clk_unprepare

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-davinci / board-dm365-evm.c

diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c
index 1b4a8adcfdc9f1f86f87079c8ab8b009e0bc105a..5d49c75388ca9782f6a8192469d6c6a0b93c6cdc 100644 (file)
--- a/arch/arm/mach-davinci/board-dm365-evm.c
+++ b/arch/arm/mach-davinci/board-dm365-evm.c
@@ -478,7 +478,7 @@ static void __init evm_init_cpld(void)
        aemif_clk = clk_get(NULL, "aemif");
        if (IS_ERR(aemif_clk))
                return;
-       clk_enable(aemif_clk);
+       clk_prepare_enable(aemif_clk);
 
        if (request_mem_region(DM365_ASYNC_EMIF_DATA_CE1_BASE, SECTION_SIZE,
                        "cpld") == NULL)
@@ -489,7 +489,7 @@ static void __init evm_init_cpld(void)
                                SECTION_SIZE);
 fail:
                pr_err("ERROR: can't map CPLD\n");
-               clk_disable(aemif_clk);
+               clk_disable_unprepare(aemif_clk);
                return;
        }