diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2011-06-13 17:51:06 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:46:44 -0800 |
| commit | f12b95f14ab993de2676ade6412815a31afb8131 (patch) | |
| tree | c87bd594f2c6d4ebe1c87bd7db10c15417783724 | |
| parent | 06316934d7b09452a510a39b479a7c687ba899ad (diff) | |
ARM: tegra: Move tegra_mc_init to arch_initcall
It's current spot, in tegra_early_init, was too early. It was being
called before we could allocate memory.
Rebase-Id: Rff026504107e75b33dccf714c5219d78c0d1dac9
| -rw-r--r-- | arch/arm/mach-tegra/common-t2.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/common-t3.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/common.c | 3 |
3 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/common-t2.c b/arch/arm/mach-tegra/common-t2.c index 514ec5726de0..79fabedec452 100644 --- a/arch/arm/mach-tegra/common-t2.c +++ b/arch/arm/mach-tegra/common-t2.c @@ -189,3 +189,4 @@ void __init tegra_mc_init(void) writel(reg, mc + MC_INT_MASK); } } +arch_initcall(tegra_mc_init); diff --git a/arch/arm/mach-tegra/common-t3.c b/arch/arm/mach-tegra/common-t3.c index d5393002b55f..c4c7752d1f42 100644 --- a/arch/arm/mach-tegra/common-t3.c +++ b/arch/arm/mach-tegra/common-t3.c @@ -206,3 +206,4 @@ void __init tegra_mc_init(void) writel(reg, mc + MC_INT_MASK); } } +arch_initcall(tegra_mc_init); diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c index b94034e6e22d..97149ef2fe97 100644 --- a/arch/arm/mach-tegra/common.c +++ b/arch/arm/mach-tegra/common.c @@ -331,9 +331,6 @@ void __init tegra_init_early(void) tegra_clk_init_from_table(common_clk_init_table); tegra_init_power(); tegra_init_cache(); -#ifndef CONFIG_ARCH_TEGRA_2x_SOC - tegra_mc_init(); /* !!!FIXME!!! Change Tegra3 behavior to match Tegra2 */ -#endif tegra_init_ahb_gizmo_settings(); } |