diff options
| author | Tony Lindgren <tony@atomide.com> | 2006-04-02 17:46:21 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-04-02 17:46:21 +0100 |
| commit | a569c6ec37e78eef4299d0a60ae4028459b27117 (patch) | |
| tree | 6f51fde75ecd91661e1fc3268cdea47c47f4dd74 /include/asm-arm | |
| parent | b824efae120b656fef562b2e81e1ed6aa88f8d24 (diff) | |
| download | op-kernel-dev-a569c6ec37e78eef4299d0a60ae4028459b27117.zip op-kernel-dev-a569c6ec37e78eef4299d0a60ae4028459b27117.tar.gz | |
[ARM] 3427/1: ARM: OMAP: 2/8 Update timers
Patch from Tony Lindgren
Update OMAP timers from linux-omap tree. The highlights of the
patch are:
- Move timer32k code from mach-omap1 to plat-omap and make it
work also on omap24xx by Tony Lindgren
- Add support for dmtimer idle check for PM by Tuukka Tikkanen
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')
| -rw-r--r-- | include/asm-arm/arch-omap/dmtimer.h | 1 | ||||
| -rw-r--r-- | include/asm-arm/arch-omap/param.h | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/include/asm-arm/arch-omap/dmtimer.h b/include/asm-arm/arch-omap/dmtimer.h index 11772c7..e6522e6 100644 --- a/include/asm-arm/arch-omap/dmtimer.h +++ b/include/asm-arm/arch-omap/dmtimer.h @@ -88,5 +88,6 @@ unsigned int omap_dm_timer_read_counter(struct omap_dm_timer *timer); void omap_dm_timer_reset_counter(struct omap_dm_timer *timer); int omap_dm_timers_active(void); +u32 omap_dm_timer_modify_idlect_mask(u32 inputmask); #endif /* __ASM_ARCH_TIMER_H */ diff --git a/include/asm-arm/arch-omap/param.h b/include/asm-arm/arch-omap/param.h new file mode 100644 index 0000000..face9ad --- /dev/null +++ b/include/asm-arm/arch-omap/param.h @@ -0,0 +1,8 @@ +/* + * linux/include/asm-arm/arch-omap/param.h + * + */ + +#ifdef CONFIG_OMAP_32K_TIMER_HZ +#define HZ CONFIG_OMAP_32K_TIMER_HZ +#endif |
