diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-03-07 20:56:35 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-04-25 17:03:39 +0200 |
| commit | 97c3213fd9fc28c0e86b69df09f4228424cafecc (patch) | |
| tree | d850fdfa998b1748d87506b2fb5fc32a4d0fca4a /drivers/mtd | |
| parent | 3a9465fa2dc42a8ebc2fe9144f4dfa23d5899f85 (diff) | |
| download | linux-stable-97c3213fd9fc28c0e86b69df09f4228424cafecc.tar.gz linux-stable-97c3213fd9fc28c0e86b69df09f4228424cafecc.tar.bz2 linux-stable-97c3213fd9fc28c0e86b69df09f4228424cafecc.zip | |
mtd mxc_nand: prepare/unprepare clock
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/mxc_nand.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c index cc0678a967c1..9e374e9bd296 100644 --- a/drivers/mtd/nand/mxc_nand.c +++ b/drivers/mtd/nand/mxc_nand.c @@ -690,7 +690,7 @@ static void mxc_nand_select_chip(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; @@ -698,7 +698,7 @@ static void mxc_nand_select_chip(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; } @@ -1078,7 +1078,7 @@ static int __init mxcnd_probe(struct platform_device *pdev) goto eclk; } - clk_enable(host->clk); + clk_prepare_enable(host->clk); host->clk_act = 1; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |