linux-mips
[Top] [All Lists]

[PATCH 2/6] MIPS: jz4740: Acquire and enable DMA controller clock

To: Ralf Baechle <ralf@linux-mips.org>, Vinod Koul <vinod.koul@intel.com>, Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org>
Subject: [PATCH 2/6] MIPS: jz4740: Acquire and enable DMA controller clock
From: Lars-Peter Clausen <lars@metafoo.de>
Date: Thu, 23 May 2013 22:36:23 +0200
Cc: Maarten ter Huurne <maarten@treewalker.org>, linux-mips@linux-mips.org, linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org, Lars-Peter Clausen <lars@metafoo.de>
In-reply-to: <1369341387-19147-1-git-send-email-lars@metafoo.de>
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <1369341387-19147-1-git-send-email-lars@metafoo.de>
Sender: linux-mips-bounce@linux-mips.org
From: Maarten ter Huurne <maarten@treewalker.org>

Previously, it was assumed that the DMA controller clock is not gated
when the kernel starts running. While that is the power-on state, it is
safer to not rely on that.

Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
 arch/mips/jz4740/dma.c | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/arch/mips/jz4740/dma.c b/arch/mips/jz4740/dma.c
index 317ec6f..0e34b97 100644
--- a/arch/mips/jz4740/dma.c
+++ b/arch/mips/jz4740/dma.c
@@ -16,6 +16,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
+#include <linux/clk.h>
 #include <linux/interrupt.h>
 
 #include <linux/dma-mapping.h>
@@ -268,6 +269,7 @@ static irqreturn_t jz4740_dma_irq(int irq, void *dev_id)
 
 static int jz4740_dma_init(void)
 {
+       struct clk *clk;
        unsigned int ret;
 
        jz4740_dma_base = ioremap(JZ4740_DMAC_BASE_ADDR, 0x400);
@@ -277,11 +279,29 @@ static int jz4740_dma_init(void)
 
        spin_lock_init(&jz4740_dma_lock);
 
-       ret = request_irq(JZ4740_IRQ_DMAC, jz4740_dma_irq, 0, "DMA", NULL);
+       clk = clk_get(NULL, "dma");
+       if (IS_ERR(clk)) {
+               ret = PTR_ERR(clk);
+               printk(KERN_ERR "JZ4740 DMA: Failed to request clock: %d\n",
+                               ret);
+               goto err_iounmap;
+       }
 
-       if (ret)
+       ret = request_irq(JZ4740_IRQ_DMAC, jz4740_dma_irq, 0, "DMA", NULL);
+       if (ret) {
                printk(KERN_ERR "JZ4740 DMA: Failed to request irq: %d\n", ret);
+               goto err_clkput;
+       }
+
+       clk_prepare_enable(clk);
+
+       return 0;
+
+err_clkput:
+       clk_put(clk);
 
+err_iounmap:
+       iounmap(jz4740_dma_base);
        return ret;
 }
 arch_initcall(jz4740_dma_init);
-- 
1.8.2.1


<Prev in Thread] Current Thread [Next in Thread>