From patchwork Fri May 25 23:14:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [09/15] nand: mxc_nand: Use clk_prepare_enable/clk_disable_unprepare Date: Fri, 25 May 2012 13:14:50 -0000 From: Fabio Estevam X-Patchwork-Id: 161437 Message-Id: <1337987696-31728-9-git-send-email-festevam@gmail.com> To: kernel@pengutronix.de Cc: Fabio Estevam , Artem Bityutskiy , linux-mtd@lists.infradead.org, shawn.guo@freescale.com From: Fabio Estevam Prepare the clock before enabling it. Cc: Artem Bityutskiy Cc: Signed-off-by: Fabio Estevam --- drivers/mtd/nand/mxc_nand.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c index fd14966..d6efa17 100644 --- a/drivers/mtd/nand/mxc_nand.c +++ b/drivers/mtd/nand/mxc_nand.c @@ -764,7 +764,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; @@ -772,7 +772,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; }