redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

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

Browse source 
Marco timer has different timer IP with prima2, so rename the current timer
to timer-prima2 so that we can add timer-marco.

at the same time, if we don't find prima2 timer node in dt, don't panic the
system as we will make prima2 and marco use same kernel image.

Signed-off-by: Barry Song <Baohua.Song@csr.com>
This commit is contained in:
Barry Song 2012-12-20 17:33:49 +08:00 committed by Barry Song
parent ea38960fb6
commit 0d5983a62a
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/mach-prima2/Makefile
View file

@ -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

2
arch/arm/mach-prima2/common.c
View file

@ -40,7 +40,7 @@ DT_MACHINE_START(PRIMA2_DT, "Generic PRIMA2 (Flattened Device Tree)")
/* Maintainer: Barry Song <baohua.song@csr.com> */
.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,

2
arch/arm/mach-prima2/common.h
View file

@ -12,7 +12,7 @@
#include <linux/init.h>
#include <asm/mach/time.h>
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);

6
arch/arm/mach-prima2/timer.c → arch/arm/mach-prima2/timer-prima2.c
View file

@ -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");