From e04c31df20a72c2d0b08476bdcc91d0e83ff684e Mon Sep 17 00:00:00 2001 From: Barry Song Date: Thu, 20 Dec 2012 17:33:49 +0800 Subject: [PATCH] --- yaml --- r: 355479 b: refs/heads/master c: 0d5983a62ad5749068a507e0c579af88f4753261 h: refs/heads/master i: 355477: 9ff0db6fb7a2143204fe38c4e3b642259c1cdc87 355475: 8b9f748032c87466c254bd459e44ecd03d31c7cb 355471: 6456a08991a8658d01795128c96e25abad647744 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-prima2/Makefile | 2 +- trunk/arch/arm/mach-prima2/common.c | 2 +- trunk/arch/arm/mach-prima2/common.h | 2 +- trunk/arch/arm/mach-prima2/{timer.c => timer-prima2.c} | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) rename trunk/arch/arm/mach-prima2/{timer.c => timer-prima2.c} (98%) diff --git a/[refs] b/[refs] index dba365f24d03..a81e17538674 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ea38960fb63ab5cce2442fa88f5041bcfb1ae8e3 +refs/heads/master: 0d5983a62ad5749068a507e0c579af88f4753261 diff --git a/trunk/arch/arm/mach-prima2/Makefile b/trunk/arch/arm/mach-prima2/Makefile index fc9ce22e2b5a..0007a6ec78f2 100644 --- a/trunk/arch/arm/mach-prima2/Makefile +++ b/trunk/arch/arm/mach-prima2/Makefile @@ -1,4 +1,3 @@ -obj-y := timer.o obj-y += rstc.o obj-y += common.o obj-y += rtciobrg.o @@ -6,3 +5,4 @@ obj-$(CONFIG_DEBUG_LL) += lluart.o obj-$(CONFIG_CACHE_L2X0) += l2x0.o obj-$(CONFIG_SUSPEND) += pm.o sleep.o obj-$(CONFIG_SIRF_IRQ) += irq.o +obj-$(CONFIG_ARCH_PRIMA2) += timer-prima2.o diff --git a/trunk/arch/arm/mach-prima2/common.c b/trunk/arch/arm/mach-prima2/common.c index ed3570e5eb8f..8e6f6681b546 100644 --- a/trunk/arch/arm/mach-prima2/common.c +++ b/trunk/arch/arm/mach-prima2/common.c @@ -40,7 +40,7 @@ DT_MACHINE_START(PRIMA2_DT, "Generic PRIMA2 (Flattened Device Tree)") /* Maintainer: Barry Song */ .map_io = sirfsoc_map_lluart, .init_irq = sirfsoc_of_irq_init, - .init_time = sirfsoc_timer_init, + .init_time = sirfsoc_prima2_timer_init, .dma_zone_size = SZ_256M, .init_machine = sirfsoc_mach_init, .init_late = sirfsoc_init_late, diff --git a/trunk/arch/arm/mach-prima2/common.h b/trunk/arch/arm/mach-prima2/common.h index 9c75f124e3cf..d6890b6833c9 100644 --- a/trunk/arch/arm/mach-prima2/common.h +++ b/trunk/arch/arm/mach-prima2/common.h @@ -12,7 +12,7 @@ #include #include -extern void sirfsoc_timer_init(void); +extern void sirfsoc_prima2_timer_init(void); extern void __init sirfsoc_of_irq_init(void); extern void __init sirfsoc_of_clk_init(void); diff --git a/trunk/arch/arm/mach-prima2/timer.c b/trunk/arch/arm/mach-prima2/timer-prima2.c similarity index 98% rename from trunk/arch/arm/mach-prima2/timer.c rename to trunk/arch/arm/mach-prima2/timer-prima2.c index 8c732a5beb7f..309e724735b7 100644 --- a/trunk/arch/arm/mach-prima2/timer.c +++ b/trunk/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");