diff options
author | Tony Lindgren <tony@atomide.com> | 2005-11-10 14:26:53 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-11-10 14:26:53 +0000 |
commit | 9ad5897c2659b3c610e0c717e8b3dbfb496d2c74 (patch) | |
tree | e3c54fd65813d0bea79e42b32cf8bfaf60643e1d /include/asm-arm/arch-omap/timex.h | |
parent | 046d6b28ebce92aab2865aa3eb3a0d8ede57e17e (diff) | |
download | blackbird-op-linux-9ad5897c2659b3c610e0c717e8b3dbfb496d2c74.tar.gz blackbird-op-linux-9ad5897c2659b3c610e0c717e8b3dbfb496d2c74.zip |
[ARM] 3143/1: OMAP 4/5: Update omap include files
Patch from Tony Lindgren
This patch syncs the mainline kernel with linux-omap tree.
This patch contains changes to common header files for
omap1xxx and omap24xx by various omap developers, and
improved cpu detection by Imre Deak
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/asm-arm/arch-omap/timex.h')
-rw-r--r-- | include/asm-arm/arch-omap/timex.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/asm-arm/arch-omap/timex.h b/include/asm-arm/arch-omap/timex.h index b61ddb491e83..21f2e367185a 100644 --- a/include/asm-arm/arch-omap/timex.h +++ b/include/asm-arm/arch-omap/timex.h @@ -28,6 +28,14 @@ #if !defined(__ASM_ARCH_OMAP_TIMEX_H) #define __ASM_ARCH_OMAP_TIMEX_H +/* + * OMAP 32KHz timer updates time one jiffie at a time from a secondary timer, + * and that's why the CLOCK_TICK_RATE is not 32768. + */ +#ifdef CONFIG_OMAP_32K_TIMER +#define CLOCK_TICK_RATE (CONFIG_OMAP_32K_TIMER_HZ) +#else #define CLOCK_TICK_RATE (HZ * 100000UL) +#endif #endif /* __ASM_ARCH_OMAP_TIMEX_H */ |