mtd: gpmi-lib: convert to clk_prepare/clk_unprepare
The patch converts gpmi nand driver to clk_prepare/clk_unprepare by using helper functions clk_prepare_enable/clk_disable_unprepare. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Cc: Huang Shijie <b32955@freescale.com> Cc: Artem Bityutskiy <artem.bityutskiy@intel.com> Acked-by: Marek Vasut <marek.vasut@gmail.com>
This commit is contained in:
parent
efdfc52c04
commit
f1f802c902
1 changed files with 6 additions and 6 deletions
|
@ -126,7 +126,7 @@ int gpmi_init(struct gpmi_nand_data *this)
|
||||||
struct resources *r = &this->resources;
|
struct resources *r = &this->resources;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ret = clk_enable(r->clock);
|
ret = clk_prepare_enable(r->clock);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto err_out;
|
goto err_out;
|
||||||
ret = gpmi_reset_block(r->gpmi_regs, false);
|
ret = gpmi_reset_block(r->gpmi_regs, false);
|
||||||
|
@ -146,7 +146,7 @@ int gpmi_init(struct gpmi_nand_data *this)
|
||||||
/* Select BCH ECC. */
|
/* Select BCH ECC. */
|
||||||
writel(BM_GPMI_CTRL1_BCH_MODE, r->gpmi_regs + HW_GPMI_CTRL1_SET);
|
writel(BM_GPMI_CTRL1_BCH_MODE, r->gpmi_regs + HW_GPMI_CTRL1_SET);
|
||||||
|
|
||||||
clk_disable(r->clock);
|
clk_disable_unprepare(r->clock);
|
||||||
return 0;
|
return 0;
|
||||||
err_out:
|
err_out:
|
||||||
return ret;
|
return ret;
|
||||||
|
@ -202,7 +202,7 @@ int bch_set_geometry(struct gpmi_nand_data *this)
|
||||||
ecc_strength = bch_geo->ecc_strength >> 1;
|
ecc_strength = bch_geo->ecc_strength >> 1;
|
||||||
page_size = bch_geo->page_size;
|
page_size = bch_geo->page_size;
|
||||||
|
|
||||||
ret = clk_enable(r->clock);
|
ret = clk_prepare_enable(r->clock);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto err_out;
|
goto err_out;
|
||||||
|
|
||||||
|
@ -229,7 +229,7 @@ int bch_set_geometry(struct gpmi_nand_data *this)
|
||||||
writel(BM_BCH_CTRL_COMPLETE_IRQ_EN,
|
writel(BM_BCH_CTRL_COMPLETE_IRQ_EN,
|
||||||
r->bch_regs + HW_BCH_CTRL_SET);
|
r->bch_regs + HW_BCH_CTRL_SET);
|
||||||
|
|
||||||
clk_disable(r->clock);
|
clk_disable_unprepare(r->clock);
|
||||||
return 0;
|
return 0;
|
||||||
err_out:
|
err_out:
|
||||||
return ret;
|
return ret;
|
||||||
|
@ -704,7 +704,7 @@ void gpmi_begin(struct gpmi_nand_data *this)
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
/* Enable the clock. */
|
/* Enable the clock. */
|
||||||
ret = clk_enable(r->clock);
|
ret = clk_prepare_enable(r->clock);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
pr_err("We failed in enable the clk\n");
|
pr_err("We failed in enable the clk\n");
|
||||||
goto err_out;
|
goto err_out;
|
||||||
|
@ -773,7 +773,7 @@ void gpmi_begin(struct gpmi_nand_data *this)
|
||||||
void gpmi_end(struct gpmi_nand_data *this)
|
void gpmi_end(struct gpmi_nand_data *this)
|
||||||
{
|
{
|
||||||
struct resources *r = &this->resources;
|
struct resources *r = &this->resources;
|
||||||
clk_disable(r->clock);
|
clk_disable_unprepare(r->clock);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Clears a BCH interrupt. */
|
/* Clears a BCH interrupt. */
|
||||||
|
|
Loading…
Reference in a new issue