From 31e3e3fa33cb716a8e443043e7e7ab9c33f2a57f Mon Sep 17 00:00:00 2001 From: R Sricharan Date: Wed, 2 May 2012 13:07:12 +0530 Subject: [PATCH] --- yaml --- r: 313419 b: refs/heads/master c: 37b3280de2a7a3feb75e939cadd988d082984566 h: refs/heads/master i: 313417: bf9c80d9f3ffe71f706bdbef41b9b23b7c8bc781 313415: 1b9bd3913c4f694377697f689a525c835f4d454d v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/common.h | 1 + trunk/arch/arm/mach-omap2/timer.c | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index cc4bd05a9ee7..10efe321590d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 05e152c76a1efaa3165afecf5acf535c8283f386 +refs/heads/master: 37b3280de2a7a3feb75e939cadd988d082984566 diff --git a/trunk/arch/arm/mach-omap2/common.h b/trunk/arch/arm/mach-omap2/common.h index 399e5bb13835..97e8792b33b0 100644 --- a/trunk/arch/arm/mach-omap2/common.h +++ b/trunk/arch/arm/mach-omap2/common.h @@ -130,6 +130,7 @@ extern struct sys_timer omap3_timer; extern struct sys_timer omap3_secure_timer; extern struct sys_timer omap3_am33xx_timer; extern struct sys_timer omap4_timer; +extern struct sys_timer omap5_timer; void omap2420_init_early(void); void omap2430_init_early(void); diff --git a/trunk/arch/arm/mach-omap2/timer.c b/trunk/arch/arm/mach-omap2/timer.c index 2b318ec92d39..13d20c8a283d 100644 --- a/trunk/arch/arm/mach-omap2/timer.c +++ b/trunk/arch/arm/mach-omap2/timer.c @@ -393,6 +393,11 @@ static void __init omap4_timer_init(void) OMAP_SYS_TIMER(4) #endif +#ifdef CONFIG_SOC_OMAP5 +OMAP_SYS_TIMER_INIT(5, 1, OMAP4_CLKEV_SOURCE, 2, OMAP4_MPU_SOURCE) +OMAP_SYS_TIMER(5) +#endif + /** * omap_timer_init - build and register timer device with an * associated timer hwmod