summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-integrator/integrator_ap.c
diff options
context:
space:
mode:
authorRussell King2011-01-11 14:00:04 +0100
committerRussell King2011-02-19 12:09:33 +0100
commitc735c9873d0c2f269fd16f4b04903da41a44cbcf (patch)
treec06f2fb2d072bd1ee35abf88c56fd838b92ed840 /arch/arm/mach-integrator/integrator_ap.c
parentARM: vexpress: switch Versatile Express to use consolidated CLCD (diff)
downloadkernel-qcow2-linux-c735c9873d0c2f269fd16f4b04903da41a44cbcf.tar.gz
kernel-qcow2-linux-c735c9873d0c2f269fd16f4b04903da41a44cbcf.tar.xz
kernel-qcow2-linux-c735c9873d0c2f269fd16f4b04903da41a44cbcf.zip
ARM: integrator: use new init_early for clock tree init
Initialize the clock tree early. Acked-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-integrator/integrator_ap.c')
-rw-r--r--arch/arm/mach-integrator/integrator_ap.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c
index b666443b5cbb..4f06b5d72489 100644
--- a/arch/arm/mach-integrator/integrator_ap.c
+++ b/arch/arm/mach-integrator/integrator_ap.c
@@ -499,8 +499,9 @@ static struct sys_timer ap_timer = {
MACHINE_START(INTEGRATOR, "ARM-Integrator")
/* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
.boot_params = 0x00000100,
- .map_io = ap_map_io,
.reserve = integrator_reserve,
+ .map_io = ap_map_io,
+ .init_early = integrator_init_early,
.init_irq = ap_init_irq,
.timer = &ap_timer,
.init_machine = ap_init,