diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-02-28 17:58:09 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-02-28 17:58:09 -0800 |
| commit | 1d90da9545b30015c0a9056909fc4b7991fa54e3 (patch) | |
| tree | f3a1de0bf9d8f4484c0cf08edc4eac2ffa7055f7 /arch/arm/mach-omap2/timer-gp.c | |
| parent | d6b5d01b3f7c10edb50b9092d8dcac9cab680ea3 (diff) | |
| parent | 38698bef545403a334cf92153874bd06dc22cc66 (diff) | |
| download | blackbird-op-linux-1d90da9545b30015c0a9056909fc4b7991fa54e3.tar.gz blackbird-op-linux-1d90da9545b30015c0a9056909fc4b7991fa54e3.zip | |
Merge branch 'hwmod_clockevent_2.6.39' of git://git.pwsan.com/linux-2.6 into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/timer-gp.c')
| -rw-r--r-- | arch/arm/mach-omap2/timer-gp.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c index 7b7c2683ae7b..fb8d656e4d0a 100644 --- a/arch/arm/mach-omap2/timer-gp.c +++ b/arch/arm/mach-omap2/timer-gp.c @@ -39,10 +39,11 @@ #include <asm/mach/time.h> #include <plat/dmtimer.h> #include <asm/localtimer.h> +#include <plat/common.h> +#include <plat/omap_hwmod.h> #include "timer-gp.h" -#include <plat/common.h> /* MAX_GPTIMER_ID: number of GPTIMERs on the chip */ #define MAX_GPTIMER_ID 12 @@ -132,9 +133,13 @@ static void __init omap2_gp_clockevent_init(void) { u32 tick_rate; int src; + char clockevent_hwmod_name[8]; /* 8 = sizeof("timerXX0") */ inited = 1; + sprintf(clockevent_hwmod_name, "timer%d", gptimer_id); + omap_hwmod_setup_one(clockevent_hwmod_name); + gptimer = omap_dm_timer_request_specific(gptimer_id); BUG_ON(gptimer == NULL); gptimer_wakeup = gptimer; |
