[PATCH 4/4] ARM: tegra: Move pinmux init call
From: Stephen Warren <hidden>
Date: 2011-02-20 03:38:57
Also in:
linux-tegra
Subsystem:
arm port, the rest · Maintainers:
Russell King, Linus Torvalds
In order for the clock initialization to pick up the results of the pinmux initialization (which will initialize various parameters of clocks cdev1, cdev2), the pinmux initialization must happen first. Move the pinmux init to achieve this. Signed-off-by: Stephen Warren <redacted> --- arch/arm/mach-tegra/board-harmony.c | 4 ++-- arch/arm/mach-tegra/board-trimslice.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-tegra/board-harmony.c b/arch/arm/mach-tegra/board-harmony.c
index b9dbdb1..eea5ad6 100644
--- a/arch/arm/mach-tegra/board-harmony.c
+++ b/arch/arm/mach-tegra/board-harmony.c@@ -104,12 +104,12 @@ static __initdata struct tegra_clk_init_table harmony_clk_init_table[] = { static void __init tegra_harmony_init(void) { + harmony_pinmux_init(); + tegra_common_init(); tegra_clk_init_from_table(harmony_clk_init_table); - harmony_pinmux_init(); - platform_add_devices(harmony_devices, ARRAY_SIZE(harmony_devices)); }
diff --git a/arch/arm/mach-tegra/board-trimslice.c b/arch/arm/mach-tegra/board-trimslice.c
index ef233b2..aef6abb 100644
--- a/arch/arm/mach-tegra/board-trimslice.c
+++ b/arch/arm/mach-tegra/board-trimslice.c@@ -85,12 +85,12 @@ subsys_initcall(tegra_trimslice_pci_init); static void __init tegra_trimslice_init(void) { + trimslice_pinmux_init(); + tegra_common_init(); tegra_clk_init_from_table(trimslice_clk_init_table); - trimslice_pinmux_init(); - platform_add_devices(trimslice_devices, ARRAY_SIZE(trimslice_devices)); }
--
1.7.1