diff options
Diffstat (limited to 'drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c')
| -rw-r--r-- | drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c index 9ffcc335d080..009165b8952d 100644 --- a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c +++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c @@ -1456,6 +1456,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; @@ -2992,12 +2996,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) @@ -3005,14 +3008,12 @@ static int gpmi_pm_resume(struct device *dev) struct gpmi_nand_data *this = dev_get_drvdata(dev); int ret; - 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 */ ret = gpmi_init(this); if (ret) { @@ -3047,8 +3048,6 @@ static int gpmi_runtime_suspend(struct device *dev) gpmi_disable_clk(this); release_bus_freq(BUS_FREQ_HIGH); - release_dma_channels(this); - return 0; } @@ -3062,11 +3061,6 @@ static 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; } |