diff options
author | Stephen Warren <swarren@nvidia.com> | 2011-01-05 16:32:20 -0500 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2011-02-20 23:04:15 -0500 |
commit | 1ca00347c579f15b0eea1a6d4bab84e2cf56e745 (patch) | |
tree | 4a80bfc4c1a849398f33a74ef45f038f38549e2b /arch/arm/mach-tegra/dma.c | |
parent | 499ef7a5c48ea9fe8034b61de304ce9f6b753fe7 (diff) |
ARM: tegra: APB DMA: Enable clock and remove reset.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Colin Cross <ccross@android.com>
Diffstat (limited to 'arch/arm/mach-tegra/dma.c')
-rw-r--r-- | arch/arm/mach-tegra/dma.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/dma.c b/arch/arm/mach-tegra/dma.c index 4625e3ae766e..2d720f2b6c75 100644 --- a/arch/arm/mach-tegra/dma.c +++ b/arch/arm/mach-tegra/dma.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <linux/err.h> | 27 | #include <linux/err.h> |
28 | #include <linux/irq.h> | 28 | #include <linux/irq.h> |
29 | #include <linux/delay.h> | 29 | #include <linux/delay.h> |
30 | #include <linux/clk.h> | ||
30 | #include <mach/dma.h> | 31 | #include <mach/dma.h> |
31 | #include <mach/irqs.h> | 32 | #include <mach/irqs.h> |
32 | #include <mach/iomap.h> | 33 | #include <mach/iomap.h> |
@@ -675,6 +676,19 @@ int __init tegra_dma_init(void) | |||
675 | int i; | 676 | int i; |
676 | unsigned int irq; | 677 | unsigned int irq; |
677 | void __iomem *addr; | 678 | void __iomem *addr; |
679 | struct clk *c; | ||
680 | |||
681 | c = clk_get_sys("tegra-dma", NULL); | ||
682 | if (IS_ERR(c)) { | ||
683 | pr_err("Unable to get clock for APB DMA\n"); | ||
684 | ret = PTR_ERR(c); | ||
685 | goto fail; | ||
686 | } | ||
687 | ret = clk_enable(c); | ||
688 | if (ret != 0) { | ||
689 | pr_err("Unable to enable clock for APB DMA\n"); | ||
690 | goto fail; | ||
691 | } | ||
678 | 692 | ||
679 | addr = IO_ADDRESS(TEGRA_APB_DMA_BASE); | 693 | addr = IO_ADDRESS(TEGRA_APB_DMA_BASE); |
680 | writel(GEN_ENABLE, addr + APB_DMA_GEN); | 694 | writel(GEN_ENABLE, addr + APB_DMA_GEN); |