openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Colin Cross 2011-02-21 17:10:14 -08:00
parent 1be3d05375
commit 0cf6230af9
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/mach-tegra/board-harmony.c
View File

@ -104,8 +104,6 @@ static __initdata struct tegra_clk_init_table harmony_clk_init_table[] = {
static void __init tegra_harmony_init(void) static void __init tegra_harmony_init(void)
{ {
tegra_common_init();
tegra_clk_init_from_table(harmony_clk_init_table); tegra_clk_init_from_table(harmony_clk_init_table);
harmony_pinmux_init(); harmony_pinmux_init();
@ -116,8 +114,9 @@ static void __init tegra_harmony_init(void)
MACHINE_START(HARMONY, "harmony") MACHINE_START(HARMONY, "harmony")
.boot_params = 0x00000100, .boot_params = 0x00000100,
.fixup = tegra_harmony_fixup, .fixup = tegra_harmony_fixup,
.init_irq = tegra_init_irq,
.init_machine = tegra_harmony_init,
.map_io = tegra_map_common_io, .map_io = tegra_map_common_io,
.init_early = tegra_init_early,
.init_irq = tegra_init_irq,
.timer = &tegra_timer, .timer = &tegra_timer,
.init_machine = tegra_harmony_init,
MACHINE_END MACHINE_END

7
arch/arm/mach-tegra/board-trimslice.c
View File

@ -85,8 +85,6 @@ subsys_initcall(tegra_trimslice_pci_init);
static void __init tegra_trimslice_init(void) static void __init tegra_trimslice_init(void)
{ {
tegra_common_init();
tegra_clk_init_from_table(trimslice_clk_init_table); tegra_clk_init_from_table(trimslice_clk_init_table);
trimslice_pinmux_init(); trimslice_pinmux_init();
@ -97,8 +95,9 @@ static void __init tegra_trimslice_init(void)
MACHINE_START(TRIMSLICE, "trimslice") MACHINE_START(TRIMSLICE, "trimslice")
.boot_params = 0x00000100, .boot_params = 0x00000100,
.fixup = tegra_trimslice_fixup, .fixup = tegra_trimslice_fixup,
.init_irq = tegra_init_irq,
.init_machine = tegra_trimslice_init,
.map_io = tegra_map_common_io, .map_io = tegra_map_common_io,
.init_early = tegra_init_early,
.init_irq = tegra_init_irq,
.timer = &tegra_timer, .timer = &tegra_timer,
.init_machine = tegra_trimslice_init,
MACHINE_END MACHINE_END

2
arch/arm/mach-tegra/board.h
View File

@ -25,7 +25,7 @@
void tegra_assert_system_reset(char mode, const char *cmd); 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_map_common_io(void);
void __init tegra_init_irq(void); void __init tegra_init_irq(void);
void __init tegra_init_clock(void); void __init tegra_init_clock(void);

2
arch/arm/mach-tegra/common.c
View File

@ -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_fuse();
tegra_init_clock(); tegra_init_clock();