[linux-yocto] [PATCH 1/6] Revert "dmaengine: dw: move clock operations to platform.c"

[wan.ahmad.zainie.wan.mohamad at intel.com]

From: "Ng, Wei Tee" <wei.tee.ng at intel.com>

This reverts commit a2adfa19c6f9adb33e1c11cacf02f0e06e166434.

Signed-off-by: Ng, Wei Tee <wei.tee.ng at intel.com>
---
 drivers/dma/dw/core.c     | 11 +++++++++++
 drivers/dma/dw/internal.h |  2 --
 drivers/dma/dw/platform.c | 25 +++----------------------
 drivers/dma/dw/regs.h     |  1 +
 4 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/drivers/dma/dw/core.c b/drivers/dma/dw/core.c
index 464b585..1030070 100644
--- a/drivers/dma/dw/core.c
+++ b/drivers/dma/dw/core.c
@@ -11,6 +11,7 @@
  */
 
 #include <linux/bitops.h>
+#include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/dmaengine.h>
 #include <linux/dma-mapping.h>
@@ -1535,6 +1536,11 @@ int dw_dma_probe(struct dw_dma_chip *chip, struct dw_dma_platform_data *pdata)
 	if (!dw)
 		return -ENOMEM;
 
+	dw->clk = devm_clk_get(chip->dev, "hclk");
+	if (IS_ERR(dw->clk))
+		return PTR_ERR(dw->clk);
+	clk_prepare_enable(dw->clk);
+
 	dw->regs = chip->regs;
 	chip->dw = dw;
 
@@ -1695,6 +1701,7 @@ void dw_dma_shutdown(struct dw_dma_chip *chip)
 	struct dw_dma *dw = chip->dw;
 
 	dw_dma_off(dw);
+	clk_disable_unprepare(dw->clk);
 }
 EXPORT_SYMBOL_GPL(dw_dma_shutdown);
 
@@ -1705,6 +1712,8 @@ int dw_dma_suspend(struct dw_dma_chip *chip)
 	struct dw_dma *dw = chip->dw;
 
 	dw_dma_off(dw);
+	clk_disable_unprepare(dw->clk);
+
 	return 0;
 }
 EXPORT_SYMBOL_GPL(dw_dma_suspend);
@@ -1713,7 +1722,9 @@ int dw_dma_resume(struct dw_dma_chip *chip)
 {
 	struct dw_dma *dw = chip->dw;
 
+	clk_prepare_enable(dw->clk);
 	dma_writel(dw, CFG, DW_CFG_DMA_EN);
+
 	return 0;
 }
 EXPORT_SYMBOL_GPL(dw_dma_resume);
diff --git a/drivers/dma/dw/internal.h b/drivers/dma/dw/internal.h
index 34eb09a..43cc1df 100644
--- a/drivers/dma/dw/internal.h
+++ b/drivers/dma/dw/internal.h
@@ -21,14 +21,12 @@
  * @dev:		struct device of the DMA controller
  * @irq:		irq line
  * @regs:		memory mapped I/O space
- * @clk:		hclk clock
  * @dw:			struct dw_dma that is filed by dw_dma_probe()
  */
 struct dw_dma_chip {
 	struct device	*dev;
 	int		irq;
 	void __iomem	*regs;
-	struct clk	*clk;
 	struct dw_dma	*dw;
 };
 
diff --git a/drivers/dma/dw/platform.c b/drivers/dma/dw/platform.c
index 697d004..e35d975 100644
--- a/drivers/dma/dw/platform.c
+++ b/drivers/dma/dw/platform.c
@@ -203,16 +203,9 @@ static int dw_probe(struct platform_device *pdev)
 
 	chip->dev = dev;
 
-	chip->clk = devm_clk_get(chip->dev, "hclk");
-	if (IS_ERR(chip->clk))
-		return PTR_ERR(chip->clk);
-	err = clk_prepare_enable(chip->clk);
-	if (err)
-		return err;
-
 	err = dw_dma_probe(chip, pdata);
 	if (err)
-		goto err_dw_dma_probe;
+		return err;
 
 	platform_set_drvdata(pdev, chip);
 
@@ -228,10 +221,6 @@ static int dw_probe(struct platform_device *pdev)
 		dw_dma_acpi_controller_register(chip->dw);
 
 	return 0;
-
-err_dw_dma_probe:
-	clk_disable_unprepare(chip->clk);
-	return err;
 }
 
 static int dw_remove(struct platform_device *pdev)
@@ -241,10 +230,7 @@ static int dw_remove(struct platform_device *pdev)
 	if (pdev->dev.of_node)
 		of_dma_controller_free(pdev->dev.of_node);
 
-	dw_dma_remove(chip);
-	clk_disable_unprepare(chip->clk);
-
-	return 0;
+	return dw_dma_remove(chip);
 }
 
 static void dw_shutdown(struct platform_device *pdev)
@@ -252,7 +238,6 @@ static void dw_shutdown(struct platform_device *pdev)
 	struct dw_dma_chip *chip = platform_get_drvdata(pdev);
 
 	dw_dma_shutdown(chip);
-	clk_disable_unprepare(chip->clk);
 }
 
 #ifdef CONFIG_OF
@@ -278,10 +263,7 @@ static int dw_suspend_noirq(struct device *dev)
 	struct platform_device *pdev = to_platform_device(dev);
 	struct dw_dma_chip *chip = platform_get_drvdata(pdev);
 
-	dw_dma_suspend(chip);
-	clk_disable_unprepare(chip->clk);
-
-	return 0;
+	return dw_dma_suspend(chip);
 }
 
 static int dw_resume_noirq(struct device *dev)
@@ -289,7 +271,6 @@ static int dw_resume_noirq(struct device *dev)
 	struct platform_device *pdev = to_platform_device(dev);
 	struct dw_dma_chip *chip = platform_get_drvdata(pdev);
 
-	clk_prepare_enable(chip->clk);
 	return dw_dma_resume(chip);
 }
 
diff --git a/drivers/dma/dw/regs.h b/drivers/dma/dw/regs.h
index 1464fa9..f6c2caf 100644
--- a/drivers/dma/dw/regs.h
+++ b/drivers/dma/dw/regs.h
@@ -250,6 +250,7 @@ struct dw_dma {
 	void __iomem		*regs;
 	struct dma_pool		*desc_pool;
 	struct tasklet_struct	tasklet;
+	struct clk		*clk;
 
 	u8			all_chan_mask;
 
-- 
1.9.1