aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-tegra/board-harmony.c
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2011-02-21 20:10:14 -0500
committerColin Cross <ccross@android.com>2011-02-22 14:25:12 -0500
commit0cf6230af909a86f81907455eca2a5c9b8f68fe6 (patch)
tree9e22caea8b2bdb4db0ea1998683214bf6a34cd39 /arch/arm/mach-tegra/board-harmony.c
parent1be3d0537516fa42825406b4bc1291b77ed62614 (diff)
ARM: tegra: Move tegra_common_init to tegra_init_early
Move tegra_common_init to tegra_init_early, and set it as the init_early entry in the machine struct. Initializes the clocks earlier so that timers can enable their clocks. Also reorders the members in the Harmony and Trimslice boards' machine structs to match the order they are called in. Signed-off-by: Colin Cross <ccross@android.com> Acked-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-tegra/board-harmony.c')
-rw-r--r--arch/arm/mach-tegra/board-harmony.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/board-harmony.c b/arch/arm/mach-tegra/board-harmony.c
index b9dbdb1289d0..368ddff953fc 100644
--- a/arch/arm/mach-tegra/board-harmony.c
+++ b/arch/arm/mach-tegra/board-harmony.c
@@ -104,8 +104,6 @@ static __initdata struct tegra_clk_init_table harmony_clk_init_table[] = {
104 104
105static void __init tegra_harmony_init(void) 105static void __init tegra_harmony_init(void)
106{ 106{
107 tegra_common_init();
108
109 tegra_clk_init_from_table(harmony_clk_init_table); 107 tegra_clk_init_from_table(harmony_clk_init_table);
110 108
111 harmony_pinmux_init(); 109 harmony_pinmux_init();
@@ -116,8 +114,9 @@ static void __init tegra_harmony_init(void)
116MACHINE_START(HARMONY, "harmony") 114MACHINE_START(HARMONY, "harmony")
117 .boot_params = 0x00000100, 115 .boot_params = 0x00000100,
118 .fixup = tegra_harmony_fixup, 116 .fixup = tegra_harmony_fixup,
119 .init_irq = tegra_init_irq,
120 .init_machine = tegra_harmony_init,
121 .map_io = tegra_map_common_io, 117 .map_io = tegra_map_common_io,
118 .init_early = tegra_init_early,
119 .init_irq = tegra_init_irq,
122 .timer = &tegra_timer, 120 .timer = &tegra_timer,
121 .init_machine = tegra_harmony_init,
123MACHINE_END 122MACHINE_END