Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[pandora-kernel.git] / arch / arm / mach-realview / core.c

diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c
index a18a5a6..75dbc87 100644 (file)
--- a/arch/arm/mach-realview/core.c
+++ b/arch/arm/mach-realview/core.c
@@ -360,18 +360,19 @@ static struct clk_lookup lookups[] = {
        }
 };
 
-static int __init clk_init(void)
+void __init realview_init_early(void)
 {
+       void __iomem *sys = __io_address(REALVIEW_SYS_BASE);
+
        if (machine_is_realview_pb1176())
-               oscvco_clk.vcoreg = __io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_OSC0_OFFSET;
+               oscvco_clk.vcoreg = sys + REALVIEW_SYS_OSC0_OFFSET;
        else
-               oscvco_clk.vcoreg = __io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_OSC4_OFFSET;
+               oscvco_clk.vcoreg = sys + REALVIEW_SYS_OSC4_OFFSET;
 
        clkdev_add_table(lookups, ARRAY_SIZE(lookups));
 
-       return 0;
+       versatile_sched_clock_init(sys + REALVIEW_SYS_24MHz_OFFSET, 24000000);
 }
-core_initcall(clk_init);
 
 /*
  * CLCD support.
@@ -509,12 +510,6 @@ void realview_leds_event(led_event_t ledevt)
 }
 #endif /* CONFIG_LEDS */
 
-/*
- * The sched_clock counter
- */
-#define REFCOUNTER             (__io_address(REALVIEW_SYS_BASE) + \
-                                REALVIEW_SYS_24MHz_OFFSET)
-
 /*
  * Where is the timer (VA)?
  */
@@ -530,8 +525,6 @@ void __init realview_timer_init(unsigned int timer_irq)
 {
        u32 val;
 
-       versatile_sched_clock_init(REFCOUNTER, 24000000);
-
        /* 
         * set clock frequency: 
         *      REALVIEW_REFCLK is 32KHz