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>

diff --git a/arch/arm/mach-tegra/board-harmony.c b/arch/arm/mach-tegra/board-harmony.c
index b9dbdb1289d045339df802c8c5e1c94390650b47..368ddff953fc60782c6dc38d4d9a173c4db229ec 100644 (file)
--- 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[] = {
 
 static void __init tegra_harmony_init(void)
 {
-       tegra_common_init();
-
        tegra_clk_init_from_table(harmony_clk_init_table);
 
        harmony_pinmux_init();
@@ -116,8 +114,9 @@ static void __init tegra_harmony_init(void)
 MACHINE_START(HARMONY, "harmony")
        .boot_params  = 0x00000100,
        .fixup          = tegra_harmony_fixup,
-       .init_irq       = tegra_init_irq,
-       .init_machine   = tegra_harmony_init,
        .map_io         = tegra_map_common_io,
+       .init_early     = tegra_init_early,
+       .init_irq       = tegra_init_irq,
        .timer          = &tegra_timer,
+       .init_machine   = tegra_harmony_init,
 MACHINE_END

diff --git a/arch/arm/mach-tegra/board-trimslice.c b/arch/arm/mach-tegra/board-trimslice.c
index ef233b28022da3727bc788991e4702571cab13c3..0f3081a97126b9b76c2ba7db8eccad74ccccfd90 100644 (file)
--- 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

diff --git a/arch/arm/mach-tegra/board.h b/arch/arm/mach-tegra/board.h
index b3f9c94fcb9edbbdbb8d2faecaa0913a70a24ca3..1d14df7eb7de97946faa00ae790a16fc6ee3d461 100644 (file)
--- a/arch/arm/mach-tegra/board.h
+++ b/arch/arm/mach-tegra/board.h
@@ -25,7 +25,7 @@
 
 void tegra_assert_system_reset(char mode, const char *cmd);
 
-void __init tegra_common_init(void);
+void __init tegra_init_early(void);
 void __init tegra_map_common_io(void);
 void __init tegra_init_irq(void);
 void __init tegra_init_clock(void);

diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c
index 54826b805b91ae3ddbcf3b9e9af8e3ee9f68227a..14fa533b1e201d23265a4854d38451759b919094 100644 (file)
--- a/arch/arm/mach-tegra/common.c
+++ b/arch/arm/mach-tegra/common.c
@@ -72,7 +72,7 @@ void __init tegra_init_cache(void)
 
 }
 
-void __init tegra_common_init(void)
+void __init tegra_init_early(void)
 {
        tegra_init_fuse();
        tegra_init_clock();