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>
This commit is contained in:
parent
499ef7a5c4
commit
1ca00347c5
|
@ -27,6 +27,7 @@
|
|||
#include <linux/err.h>
|
||||
#include <linux/irq.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/clk.h>
|
||||
#include <mach/dma.h>
|
||||
#include <mach/irqs.h>
|
||||
#include <mach/iomap.h>
|
||||
|
@ -675,6 +676,19 @@ int __init tegra_dma_init(void)
|
|||
int i;
|
||||
unsigned int irq;
|
||||
void __iomem *addr;
|
||||
struct clk *c;
|
||||
|
||||
c = clk_get_sys("tegra-dma", NULL);
|
||||
if (IS_ERR(c)) {
|
||||
pr_err("Unable to get clock for APB DMA\n");
|
||||
ret = PTR_ERR(c);
|
||||
goto fail;
|
||||
}
|
||||
ret = clk_enable(c);
|
||||
if (ret != 0) {
|
||||
pr_err("Unable to enable clock for APB DMA\n");
|
||||
goto fail;
|
||||
}
|
||||
|
||||
addr = IO_ADDRESS(TEGRA_APB_DMA_BASE);
|
||||
writel(GEN_ENABLE, addr + APB_DMA_GEN);
|
||||
|
|
|
@ -1759,6 +1759,11 @@ static struct clk_mux_sel mux_clk_32k[] = {
|
|||
{ 0, 0},
|
||||
};
|
||||
|
||||
static struct clk_mux_sel mux_pclk[] = {
|
||||
{ .input = &tegra_clk_pclk, .value = 0},
|
||||
{ 0, 0},
|
||||
};
|
||||
|
||||
#define PERIPH_CLK(_name, _dev, _con, _clk_num, _reg, _max, _inputs, _flags) \
|
||||
{ \
|
||||
.name = _name, \
|
||||
|
@ -1775,6 +1780,7 @@ static struct clk_mux_sel mux_clk_32k[] = {
|
|||
}
|
||||
|
||||
struct clk tegra_periph_clks[] = {
|
||||
PERIPH_CLK("apbdma", "tegra-dma", NULL, 34, 0, 108000000, mux_pclk, 0),
|
||||
PERIPH_CLK("rtc", "rtc-tegra", NULL, 4, 0, 32768, mux_clk_32k, PERIPH_NO_RESET),
|
||||
PERIPH_CLK("timer", "timer", NULL, 5, 0, 26000000, mux_clk_m, 0),
|
||||
PERIPH_CLK("i2s1", "i2s.0", NULL, 11, 0x100, 26000000, mux_pllaout0_audio2x_pllp_clkm, MUX | DIV_U71),
|
||||
|
|
Loading…
Reference in a new issue