1 files changed, 22 insertions, 3 deletions

diff --git a/drivers/dma/dw/platform.c b/drivers/dma/dw/platform.c
index 860c9acf3fef..d50077e48187 100644
--- a/drivers/dma/dw/platform.c
+++ b/drivers/dma/dw/platform.c
@@ -178,10 +178,17 @@ static int dw_probe(struct platform_device *pdev)
 
         chip->dev = dev;
 
-        err = dw_dma_probe(chip, pdata);
+        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;
+
         platform_set_drvdata(pdev, chip);
 
         if (pdev->dev.of_node) {
@@ -196,6 +203,10 @@ 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)
@@ -205,7 +216,10 @@ static int dw_remove(struct platform_device *pdev)
         if (pdev->dev.of_node)
                 of_dma_controller_free(pdev->dev.of_node);
 
-        return dw_dma_remove(chip);
+        dw_dma_remove(chip);
+        clk_disable_unprepare(chip->clk);
+
+        return 0;
 }
 
 static void dw_shutdown(struct platform_device *pdev)
@@ -213,6 +227,7 @@ 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
@@ -238,7 +253,10 @@ static int dw_suspend_late(struct device *dev)
         struct platform_device *pdev = to_platform_device(dev);
         struct dw_dma_chip *chip = platform_get_drvdata(pdev);
 
-        return dw_dma_suspend(chip);
+        dw_dma_suspend(chip);
+        clk_disable_unprepare(chip->clk);
+
+        return 0;
 }
 
 static int dw_resume_early(struct device *dev)
@@ -246,6 +264,7 @@ static int dw_resume_early(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);
 }