From 0bc2ba733e08128041138d56da1227c02351f69b Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Mon, 21 Feb 2011 17:10:14 -0800
Subject: [PATCH] --- yaml --- r: 235256 b: refs/heads/master c:
 0cf6230af909a86f81907455eca2a5c9b8f68fe6 h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/arm/mach-tegra/board-harmony.c   | 7 +++----
 trunk/arch/arm/mach-tegra/board-trimslice.c | 7 +++----
 trunk/arch/arm/mach-tegra/board.h           | 2 +-
 trunk/arch/arm/mach-tegra/common.c          | 2 +-
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 3156294216df..dcdb6bc4a4b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1be3d0537516fa42825406b4bc1291b77ed62614
+refs/heads/master: 0cf6230af909a86f81907455eca2a5c9b8f68fe6
diff --git a/trunk/arch/arm/mach-tegra/board-harmony.c b/trunk/arch/arm/mach-tegra/board-harmony.c
index b9dbdb1289d0..368ddff953fc 100644
--- a/trunk/arch/arm/mach-tegra/board-harmony.c
+++ b/trunk/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/trunk/arch/arm/mach-tegra/board-trimslice.c b/trunk/arch/arm/mach-tegra/board-trimslice.c
index ef233b28022d..0f3081a97126 100644
--- a/trunk/arch/arm/mach-tegra/board-trimslice.c
+++ b/trunk/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/trunk/arch/arm/mach-tegra/board.h b/trunk/arch/arm/mach-tegra/board.h
index b3f9c94fcb9e..1d14df7eb7de 100644
--- a/trunk/arch/arm/mach-tegra/board.h
+++ b/trunk/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/trunk/arch/arm/mach-tegra/common.c b/trunk/arch/arm/mach-tegra/common.c
index 54826b805b91..14fa533b1e20 100644
--- a/trunk/arch/arm/mach-tegra/common.c
+++ b/trunk/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();