ARM: PRIMA2: mv timer to timer-prima2 as we will add timer-marco

[pandora-kernel.git] / arch / arm / mach-prima2 / timer-prima2.c

diff --git a/arch/arm/mach-prima2/timer.c b/arch/arm/mach-prima2/timer-prima2.c
similarity index 98%
rename from arch/arm/mach-prima2/timer.c
rename to arch/arm/mach-prima2/timer-prima2.c
index 8c732a5..309e724 100644 (file)
--- a/arch/arm/mach-prima2/timer.c
+++ b/arch/arm/mach-prima2/timer-prima2.c
@@ -187,7 +187,7 @@ static void __init sirfsoc_clockevent_init(void)
 }
 
 /* initialize the kernel jiffy timer source */
-void __init sirfsoc_timer_init(void)
+void __init sirfsoc_prima2_timer_init(void)
 {
        unsigned long rate;
        struct clk *clk;
@@ -226,14 +226,14 @@ static struct of_device_id timer_ids[] = {
        {},
 };
 
-void __init sirfsoc_of_timer_map(void)
+static void __init sirfsoc_of_timer_map(void)
 {
        struct device_node *np;
        const unsigned int *intspec;
 
        np = of_find_matching_node(NULL, timer_ids);
        if (!np)
-               panic("unable to find compatible timer node in dtb\n");
+               return;
        sirfsoc_timer_base = of_iomap(np, 0);
        if (!sirfsoc_timer_base)
                panic("unable to map timer cpu registers\n");