diff options
Diffstat (limited to 'drivers/mtd/nand/gpmi-nand/gpmi-nand.c')
-rw-r--r-- | drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 37 |
1 files changed, 15 insertions, 22 deletions
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c index bb8d50211fb1..bb380757a466 100644 --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c @@ -901,6 +901,10 @@ static int acquire_resources(struct gpmi_nand_data *this) if (ret) goto exit_regs; + ret = acquire_dma_channels(this); + if (ret) + goto exit_regs; + ret = gpmi_get_clks(this); if (ret) goto exit_clock; @@ -2332,14 +2336,14 @@ static int gpmi_nand_init(struct gpmi_nand_data *this) if (of_property_read_bool(this->dev->of_node, "fsl,no-blockmark-swap")) this->swap_block_mark = false; - - if (of_property_read_bool(this->dev->of_node, - "fsl,legacy-bch-geometry")) - this->legacy_bch_geometry = true; } dev_dbg(this->dev, "Blockmark swapping %sabled\n", this->swap_block_mark ? "en" : "dis"); + if (of_property_read_bool(this->dev->of_node, + "fsl,legacy-bch-geometry")) + this->legacy_bch_geometry = true; + ret = gpmi_init_last(this); if (ret) goto err_out; @@ -2467,12 +2471,11 @@ static int gpmi_nand_remove(struct platform_device *pdev) #ifdef CONFIG_PM_SLEEP static int gpmi_pm_suspend(struct device *dev) { - int ret; + struct gpmi_nand_data *this = dev_get_drvdata(dev); + release_dma_channels(this); pinctrl_pm_select_sleep_state(dev); - ret = pm_runtime_force_suspend(dev); - - return ret; + return 0; } static int gpmi_pm_resume(struct device *dev) @@ -2480,15 +2483,12 @@ static int gpmi_pm_resume(struct device *dev) struct gpmi_nand_data *this = dev_get_drvdata(dev); int ret; - /* enable clock, acquire dma */ - ret = pm_runtime_force_resume(dev); - if (ret) { - dev_err(this->dev, "Error in resume: %d\n", ret); - return ret; - } - pinctrl_pm_select_default_state(dev); + ret = acquire_dma_channels(this); + if (ret < 0) + return ret; + /* re-init the GPMI registers */ this->flags &= ~GPMI_TIMING_INIT_OK; ret = gpmi_init(this); @@ -2520,8 +2520,6 @@ int gpmi_runtime_suspend(struct device *dev) gpmi_disable_clk(this); release_bus_freq(BUS_FREQ_HIGH); - release_dma_channels(this); - return 0; } @@ -2535,11 +2533,6 @@ int gpmi_runtime_resume(struct device *dev) return ret; request_bus_freq(BUS_FREQ_HIGH); - - ret = acquire_dma_channels(this); - if (ret < 0) - return ret; - return 0; } |