From d40247805c14953ffa0f3883492898f074b57114 Mon Sep 17 00:00:00 2001 From: Igor Grinberg Date: Sun, 18 Nov 2012 17:06:41 +0200 Subject: [PATCH] --- yaml --- r: 339943 b: refs/heads/master c: 26f01998b0657a61167a819f1c37cb9f9e9d674b h: refs/heads/master i: 339941: 6ff13c8f50da01f7724165614e1dd1195e643109 339939: 0254012a69e8a0511cb472023d55bfd1ff848626 339935: 13129f309ee51fc2742ee6d7698de2136fb4d60a v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/board-cm-t3517.c | 2 +- trunk/arch/arm/mach-omap2/common.h | 1 + trunk/arch/arm/mach-omap2/timer.c | 3 +++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2b295b7ec5cc..d3feca5005db 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6f80b3bb8a0ae4ae376dbdc69acf1fca8b4e2c9c +refs/heads/master: 26f01998b0657a61167a819f1c37cb9f9e9d674b diff --git a/trunk/arch/arm/mach-omap2/board-cm-t3517.c b/trunk/arch/arm/mach-omap2/board-cm-t3517.c index 278664731d2c..54930c9a3b18 100644 --- a/trunk/arch/arm/mach-omap2/board-cm-t3517.c +++ b/trunk/arch/arm/mach-omap2/board-cm-t3517.c @@ -297,6 +297,6 @@ MACHINE_START(CM_T3517, "Compulab CM-T3517") .handle_irq = omap3_intc_handle_irq, .init_machine = cm_t3517_init, .init_late = am35xx_init_late, - .timer = &omap3_timer, + .timer = &omap3_gp_timer, .restart = omap_prcm_restart, MACHINE_END diff --git a/trunk/arch/arm/mach-omap2/common.h b/trunk/arch/arm/mach-omap2/common.h index 426fcfcfd821..3f781d245cc6 100644 --- a/trunk/arch/arm/mach-omap2/common.h +++ b/trunk/arch/arm/mach-omap2/common.h @@ -138,6 +138,7 @@ extern void omap2_init_common_infrastructure(void); extern struct sys_timer omap2_timer; extern struct sys_timer omap3_timer; extern struct sys_timer omap3_secure_timer; +extern struct sys_timer omap3_gp_timer; extern struct sys_timer omap3_am33xx_timer; extern struct sys_timer omap4_timer; extern struct sys_timer omap5_timer; diff --git a/trunk/arch/arm/mach-omap2/timer.c b/trunk/arch/arm/mach-omap2/timer.c index bbe3cc2c1fca..b9cff72ceaec 100644 --- a/trunk/arch/arm/mach-omap2/timer.c +++ b/trunk/arch/arm/mach-omap2/timer.c @@ -594,6 +594,9 @@ OMAP_SYS_TIMER(3, sync32k); OMAP_SYS_32K_TIMER_INIT(3_secure, 12, OMAP3_32K_SOURCE, "ti,timer-secure", 2, OMAP3_MPU_SOURCE); OMAP_SYS_TIMER(3_secure, sync32k); +OMAP_SYS_GP_TIMER_INIT(3_gp, 1, OMAP3_MPU_SOURCE, "ti,timer-alwon", + 2, OMAP3_MPU_SOURCE); +OMAP_SYS_TIMER(3_gp, gptimer); #endif /* CONFIG_ARCH_OMAP3 */ #ifdef CONFIG_SOC_AM33XX