dc54c23bb0
The following commit makes the Tegra APB DMA engine fail to initialize
correctly: 0cf6230af9
ARM: tegra: Move tegra_common_init to tegra_init_early
The reason is that tegra_init_early_ calls tegra_dma_init which calls
request_threaded_irq, which fails since the IRQ hasn't yet been marked
valid; that only happens in tegra_init_irq, which gets called after
tegra_init_early.
This used to work OK, since tegra_init_early was tegra_common_init, which
got called after tegra_init_irq, basically from the beginning of
tegra_harmony_init.
Solve this by converting tegra_dma_init to a postcore_initcall. This makes
it execute late enough that IRQs are marked valid, and avoids having to
add it back to every machine's init function.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Colin Cross <ccross@android.com>
84 lines
2.2 KiB
C
84 lines
2.2 KiB
C
/*
|
|
* arch/arm/mach-tegra/board-harmony.c
|
|
*
|
|
* Copyright (C) 2010 Google, Inc.
|
|
*
|
|
* Author:
|
|
* Colin Cross <ccross@android.com>
|
|
*
|
|
* This software is licensed under the terms of the GNU General Public
|
|
* License version 2, as published by the Free Software Foundation, and
|
|
* may be copied, distributed, and modified under those terms.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
*/
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/io.h>
|
|
#include <linux/clk.h>
|
|
#include <linux/delay.h>
|
|
|
|
#include <asm/hardware/cache-l2x0.h>
|
|
|
|
#include <mach/iomap.h>
|
|
#include <mach/system.h>
|
|
|
|
#include "board.h"
|
|
#include "clock.h"
|
|
#include "fuse.h"
|
|
|
|
void (*arch_reset)(char mode, const char *cmd) = tegra_assert_system_reset;
|
|
|
|
void tegra_assert_system_reset(char mode, const char *cmd)
|
|
{
|
|
void __iomem *reset = IO_ADDRESS(TEGRA_CLK_RESET_BASE + 0x04);
|
|
u32 reg;
|
|
|
|
/* use *_related to avoid spinlock since caches are off */
|
|
reg = readl_relaxed(reset);
|
|
reg |= 0x04;
|
|
writel_relaxed(reg, reset);
|
|
}
|
|
|
|
static __initdata struct tegra_clk_init_table common_clk_init_table[] = {
|
|
/* name parent rate enabled */
|
|
{ "clk_m", NULL, 0, true },
|
|
{ "pll_p", "clk_m", 216000000, true },
|
|
{ "pll_p_out1", "pll_p", 28800000, true },
|
|
{ "pll_p_out2", "pll_p", 48000000, true },
|
|
{ "pll_p_out3", "pll_p", 72000000, true },
|
|
{ "pll_p_out4", "pll_p", 108000000, true },
|
|
{ "sclk", "pll_p_out4", 108000000, true },
|
|
{ "hclk", "sclk", 108000000, true },
|
|
{ "pclk", "hclk", 54000000, true },
|
|
{ "csite", NULL, 0, true },
|
|
{ "emc", NULL, 0, true },
|
|
{ "cpu", NULL, 0, true },
|
|
{ NULL, NULL, 0, 0},
|
|
};
|
|
|
|
void __init tegra_init_cache(void)
|
|
{
|
|
#ifdef CONFIG_CACHE_L2X0
|
|
void __iomem *p = IO_ADDRESS(TEGRA_ARM_PERIF_BASE) + 0x3000;
|
|
|
|
writel_relaxed(0x331, p + L2X0_TAG_LATENCY_CTRL);
|
|
writel_relaxed(0x441, p + L2X0_DATA_LATENCY_CTRL);
|
|
|
|
l2x0_init(p, 0x6C080001, 0x8200c3fe);
|
|
#endif
|
|
|
|
}
|
|
|
|
void __init tegra_init_early(void)
|
|
{
|
|
tegra_init_fuse();
|
|
tegra_init_clock();
|
|
tegra_clk_init_from_table(common_clk_init_table);
|
|
tegra_init_cache();
|
|
}
|