diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-03-07 14:56:35 -0500 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-04-25 11:03:39 -0400 |
commit | 97c3213fd9fc28c0e86b69df09f4228424cafecc (patch) | |
tree | d850fdfa998b1748d87506b2fb5fc32a4d0fca4a | |
parent | 3a9465fa2dc42a8ebc2fe9144f4dfa23d5899f85 (diff) |
mtd mxc_nand: prepare/unprepare clock
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-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) | |||
690 | if (chip == -1) { | 690 | if (chip == -1) { |
691 | /* Disable the NFC clock */ | 691 | /* Disable the NFC clock */ |
692 | if (host->clk_act) { | 692 | if (host->clk_act) { |
693 | clk_disable(host->clk); | 693 | clk_disable_unprepare(host->clk); |
694 | host->clk_act = 0; | 694 | host->clk_act = 0; |
695 | } | 695 | } |
696 | return; | 696 | return; |
@@ -698,7 +698,7 @@ static void mxc_nand_select_chip(struct mtd_info *mtd, int chip) | |||
698 | 698 | ||
699 | if (!host->clk_act) { | 699 | if (!host->clk_act) { |
700 | /* Enable the NFC clock */ | 700 | /* Enable the NFC clock */ |
701 | clk_enable(host->clk); | 701 | clk_prepare_enable(host->clk); |
702 | host->clk_act = 1; | 702 | host->clk_act = 1; |
703 | } | 703 | } |
704 | 704 | ||
@@ -1078,7 +1078,7 @@ static int __init mxcnd_probe(struct platform_device *pdev) | |||
1078 | goto eclk; | 1078 | goto eclk; |
1079 | } | 1079 | } |
1080 | 1080 | ||
1081 | clk_enable(host->clk); | 1081 | clk_prepare_enable(host->clk); |
1082 | host->clk_act = 1; | 1082 | host->clk_act = 1; |
1083 | 1083 | ||
1084 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 1084 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |