aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mtd/nand/gpmi-nand/gpmi-lib.c')
-rw-r--r--drivers/mtd/nand/gpmi-nand/gpmi-lib.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
index de4db7604a3..2a56fc6f399 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
@@ -126,7 +126,7 @@ int gpmi_init(struct gpmi_nand_data *this)
126 struct resources *r = &this->resources; 126 struct resources *r = &this->resources;
127 int ret; 127 int ret;
128 128
129 ret = clk_enable(r->clock); 129 ret = clk_prepare_enable(r->clock);
130 if (ret) 130 if (ret)
131 goto err_out; 131 goto err_out;
132 ret = gpmi_reset_block(r->gpmi_regs, false); 132 ret = gpmi_reset_block(r->gpmi_regs, false);
@@ -146,7 +146,7 @@ int gpmi_init(struct gpmi_nand_data *this)
146 /* Select BCH ECC. */ 146 /* Select BCH ECC. */
147 writel(BM_GPMI_CTRL1_BCH_MODE, r->gpmi_regs + HW_GPMI_CTRL1_SET); 147 writel(BM_GPMI_CTRL1_BCH_MODE, r->gpmi_regs + HW_GPMI_CTRL1_SET);
148 148
149 clk_disable(r->clock); 149 clk_disable_unprepare(r->clock);
150 return 0; 150 return 0;
151err_out: 151err_out:
152 return ret; 152 return ret;
@@ -202,7 +202,7 @@ int bch_set_geometry(struct gpmi_nand_data *this)
202 ecc_strength = bch_geo->ecc_strength >> 1; 202 ecc_strength = bch_geo->ecc_strength >> 1;
203 page_size = bch_geo->page_size; 203 page_size = bch_geo->page_size;
204 204
205 ret = clk_enable(r->clock); 205 ret = clk_prepare_enable(r->clock);
206 if (ret) 206 if (ret)
207 goto err_out; 207 goto err_out;
208 208
@@ -229,7 +229,7 @@ int bch_set_geometry(struct gpmi_nand_data *this)
229 writel(BM_BCH_CTRL_COMPLETE_IRQ_EN, 229 writel(BM_BCH_CTRL_COMPLETE_IRQ_EN,
230 r->bch_regs + HW_BCH_CTRL_SET); 230 r->bch_regs + HW_BCH_CTRL_SET);
231 231
232 clk_disable(r->clock); 232 clk_disable_unprepare(r->clock);
233 return 0; 233 return 0;
234err_out: 234err_out:
235 return ret; 235 return ret;
@@ -704,7 +704,7 @@ void gpmi_begin(struct gpmi_nand_data *this)
704 int ret; 704 int ret;
705 705
706 /* Enable the clock. */ 706 /* Enable the clock. */
707 ret = clk_enable(r->clock); 707 ret = clk_prepare_enable(r->clock);
708 if (ret) { 708 if (ret) {
709 pr_err("We failed in enable the clk\n"); 709 pr_err("We failed in enable the clk\n");
710 goto err_out; 710 goto err_out;
@@ -773,7 +773,7 @@ err_out:
773void gpmi_end(struct gpmi_nand_data *this) 773void gpmi_end(struct gpmi_nand_data *this)
774{ 774{
775 struct resources *r = &this->resources; 775 struct resources *r = &this->resources;
776 clk_disable(r->clock); 776 clk_disable_unprepare(r->clock);
777} 777}
778 778
779/* Clears a BCH interrupt. */ 779/* Clears a BCH interrupt. */