]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
nand: mxc_nand: Use clk_prepare_enable/clk_disable_unprepare
authorFabio Estevam <fabio.estevam@freescale.com>
Fri, 25 May 2012 23:14:50 +0000 (20:14 -0300)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Fri, 6 Jul 2012 17:17:05 +0000 (18:17 +0100)
Prepare the clock before enabling it.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
drivers/mtd/nand/mxc_nand.c

index 6acc790c2fbb96880ec29642a1d2e7e2528dbee9..fc3b38c7ffb4c8f3442ec811681ecbabb3f8ef1f 100644 (file)
@@ -784,7 +784,7 @@ static void mxc_nand_select_chip_v2(struct mtd_info *mtd, int chip)
        if (chip == -1) {
                /* Disable the NFC clock */
                if (host->clk_act) {
-                       clk_disable(host->clk);
+                       clk_disable_unprepare(host->clk);
                        host->clk_act = 0;
                }
                return;
@@ -792,7 +792,7 @@ static void mxc_nand_select_chip_v2(struct mtd_info *mtd, int chip)
 
        if (!host->clk_act) {
                /* Enable the NFC clock */
-               clk_enable(host->clk);
+               clk_prepare_enable(host->clk);
                host->clk_act = 1;
        }