From 0cf6230af909a86f81907455eca2a5c9b8f68fe6 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 21 Feb 2011 17:10:14 -0800 Subject: 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 Acked-by: Olof Johansson --- arch/arm/mach-tegra/board-trimslice.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'arch/arm/mach-tegra/board-trimslice.c') diff --git a/arch/arm/mach-tegra/board-trimslice.c b/arch/arm/mach-tegra/board-trimslice.c index ef233b28022..0f3081a9712 100644 --- a/arch/arm/mach-tegra/board-trimslice.c +++ b/arch/arm/mach-tegra/board-trimslice.c @@ -85,8 +85,6 @@ subsys_initcall(tegra_trimslice_pci_init); static void __init tegra_trimslice_init(void) { - tegra_common_init(); - tegra_clk_init_from_table(trimslice_clk_init_table); trimslice_pinmux_init(); @@ -97,8 +95,9 @@ static void __init tegra_trimslice_init(void) MACHINE_START(TRIMSLICE, "trimslice") .boot_params = 0x00000100, .fixup = tegra_trimslice_fixup, - .init_irq = tegra_init_irq, - .init_machine = tegra_trimslice_init, .map_io = tegra_map_common_io, + .init_early = tegra_init_early, + .init_irq = tegra_init_irq, .timer = &tegra_timer, + .init_machine = tegra_trimslice_init, MACHINE_END -- cgit v1.2.3-70-g09d2