Module: xenomai-head Branch: master Commit: 30463bb56a6e18098366a71677ec0c2231118c99 URL: http://git.xenomai.org/?p=xenomai-head.git;a=commit;h=30463bb56a6e18098366a71677ec0c2231118c99
Author: Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org> Date: Wed May 25 21:23:53 2011 +0200 arm: add support for cortex A9 mpcore timer/tsc --- include/asm-arm/hal.h | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/include/asm-arm/hal.h b/include/asm-arm/hal.h index e9c1efe..1f69a7a 100644 --- a/include/asm-arm/hal.h +++ b/include/asm-arm/hal.h @@ -58,9 +58,18 @@ #elif defined(CONFIG_ARCH_MXC) #define RTHAL_TIMER_DEVICE "mxc_timer1" #define RTHAL_CLOCK_DEVICE "mxc_timer1" -#elif defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4) +#elif defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) #define RTHAL_TIMER_DEVICE "gp timer" #define RTHAL_CLOCK_DEVICE "gp timer" +#elif defined(CONFIG_ARCH_OMAP4) +#ifndef CONFIG_SMP +#define RTHAL_TIMER_DEVICE "gp timer" +#define RTHAL_CLOCK_DEVICE "gp timer" +/* omap4 SMP uses TWD */ +#endif +#elif defined(CONFIG_PLAT_ORION) +#define RTHAL_TIMER_DEVICE "orion_tick" +#define RTHAL_CLOCK_DEVICE "orion_clocksource" #elif defined(CONFIG_ARCH_PXA) #define RTHAL_TIMER_DEVICE "osmr0" #define RTHAL_CLOCK_DEVICE "oscr0" @@ -70,9 +79,9 @@ #elif defined(CONFIG_ARCH_SA1100) #define RTHAL_TIMER_DEVICE "osmr0" #define RTHAL_CLOCK_DEVICE "oscr0" -#elif defined(CONFIG_PLAT_ORION) -#define RTHAL_TIMER_DEVICE "orion_tick" -#define RTHAL_CLOCK_DEVICE "orion_clocksource" +#elif defined(CONFIG_SMP) && defined(CONFIG_HAVE_ARM_TWD) +#define RTHAL_TIMER_DEVICE "local_timer" +#define RTHAL_CLOCK_DEVICE "global_timer" #else #error "Unsupported ARM machine" #endif /* CONFIG_ARCH_SA1100 */ _______________________________________________ Xenomai-git mailing list Xenomai-git@gna.org https://mail.gna.org/listinfo/xenomai-git
