clocksource: ARM sp804: obtain sp804 timer rate via clks

[pandora-kernel.git] / arch / arm / mach-integrator / integrator_cp.c

diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
index 9e3ce26..8fb8afb 100644 (file)
--- a/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
@@ -229,10 +229,17 @@ static struct clk cp_auxclk = {
        .vcoreg = CM_AUXOSC,
 };
 
+static struct clk sp804_clk = {
+       .rate   = 1000000,
+};
+
 static struct clk_lookup cp_lookups[] = {
        {       /* CLCD */
                .dev_id         = "mb:c0",
                .clk            = &cp_auxclk,
+       }, {    /* SP804 timers */
+               .dev_id         = "sp804",
+               .clk            = &sp804_clk,
        },
 };
 
@@ -476,7 +483,7 @@ static void __init intcp_timer_init(void)
        writel(0, TIMER1_VA_BASE + TIMER_CTRL);
        writel(0, TIMER2_VA_BASE + TIMER_CTRL);
 
-       sp804_clocksource_init(TIMER2_VA_BASE);
+       sp804_clocksource_init(TIMER2_VA_BASE, "timer2");
        sp804_clockevents_init(TIMER1_VA_BASE, IRQ_TIMERINT1);
 }