diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-03-29 15:54:50 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-06-27 12:14:02 -0700 |
| commit | 0f622e8cae379ee17e1ffe867336b74c5b16f958 (patch) | |
| tree | 9df899f87b8bca9e35a5d448ebe5d99135f94116 | |
| parent | 0c336dc5ec492886620d4afdc252c63f32adbd0e (diff) | |
| download | blackbird-op-linux-0f622e8cae379ee17e1ffe867336b74c5b16f958.tar.gz blackbird-op-linux-0f622e8cae379ee17e1ffe867336b74c5b16f958.zip | |
omap2+: Rename timer-gp.c into timer.c to combine timer init functions
We can keep everything sys_timer and gptimer.c related code in
timer.c as the code will be very minimal.
Later on we can also remove timer-mpu.c, as it can be called from
omap4_timer_init function.
This allows us to get rid of confusing existing files. We currently
have timer-gp.c, timer-mpu.c, and patches have been posted to add
dmtimer.c. There's no need to have these multiple files, we can
put everything into timer.c.
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | arch/arm/mach-omap2/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/timer.c (renamed from arch/arm/mach-omap2/timer-gp.c) | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index b14807794401..adbe82d72d4e 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -3,7 +3,7 @@ # # Common support -obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer-gp.o pm.o \ +obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer.o pm.o \ common.o gpio.o dma.o wd_timer.o omap-2-3-common = irq.o sdrc.o diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer.c index ab1931c6f350..e9640728239b 100644 --- a/arch/arm/mach-omap2/timer-gp.c +++ b/arch/arm/mach-omap2/timer.c @@ -1,5 +1,5 @@ /* - * linux/arch/arm/mach-omap2/timer-gp.c + * linux/arch/arm/mach-omap2/timer.c * * OMAP2 GP timer support. * @@ -230,7 +230,7 @@ static void __init omap2_gp_clockevent_init(int gptimer_id, /* Clocksource code */ #ifdef CONFIG_OMAP_32K_TIMER -/* +/* * When 32k-timer is enabled, don't use GPTimer for clocksource * instead, just leave default clocksource which uses the 32k * sync counter. See clocksource setup in plat-omap/counter_32k.c |
