diff options
| author | Colin Cross <ccross@android.com> | 2011-02-22 02:10:14 +0100 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-02-22 20:25:12 +0100 |
| commit | 0cf6230af909a86f81907455eca2a5c9b8f68fe6 (patch) | |
| tree | 9e22caea8b2bdb4db0ea1998683214bf6a34cd39 /arch/arm/mach-tegra/board-trimslice.c | |
| parent | ARM: tegra: clock: prevent accidental disables of cpu clock (diff) | |
| download | linux-0cf6230af909a86f81907455eca2a5c9b8f68fe6.tar.xz linux-0cf6230af909a86f81907455eca2a5c9b8f68fe6.zip | |
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-trimslice.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-trimslice.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/board-trimslice.c b/arch/arm/mach-tegra/board-trimslice.c index ef233b28022d..0f3081a97126 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 |