Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

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

diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c
index 335d825..0c99cf0 100644 (file)
--- a/arch/arm/mach-versatile/core.c
+++ b/arch/arm/mach-versatile/core.c
@@ -352,6 +352,10 @@ static struct clk ref24_clk = {
        .rate   = 24000000,
 };
 
+static struct clk sp804_clk = {
+       .rate   = 1000000,
+};
+
 static struct clk dummy_apb_pclk;
 
 static struct clk_lookup lookups[] = {
@@ -388,7 +392,10 @@ static struct clk_lookup lookups[] = {
        }, {    /* CLCD */
                .dev_id         = "dev:20",
                .clk            = &osc4_clk,
-       }
+       }, {    /* SP804 timers */
+               .dev_id         = "sp804",
+               .clk            = &sp804_clk,
+       },
 };
 
 /*
@@ -741,8 +748,8 @@ static void __init versatile_timer_init(void)
        writel(0, TIMER2_VA_BASE + TIMER_CTRL);
        writel(0, TIMER3_VA_BASE + TIMER_CTRL);
 
-       sp804_clocksource_init(TIMER3_VA_BASE);
-       sp804_clockevents_init(TIMER0_VA_BASE, IRQ_TIMERINT0_1);
+       sp804_clocksource_init(TIMER3_VA_BASE, "timer3");
+       sp804_clockevents_init(TIMER0_VA_BASE, IRQ_TIMERINT0_1, "timer0");
 }
 
 struct sys_timer versatile_timer = {