diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-04-24 09:56:16 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-04-24 09:56:16 -0700 |
| commit | 535ff672e3589a38f60567314bc2ae15b9ab2604 (patch) | |
| tree | f0401090f244d06b6749e6b8f6cd0b94054dbf53 /arch/arm/plat-omap/include | |
| parent | 846c29f109fc27bd93817271689a752afc9168f8 (diff) | |
| parent | f248076c0dad45b7e50f27096e1aac6a617665db (diff) | |
| download | op-kernel-dev-535ff672e3589a38f60567314bc2ae15b9ab2604.zip op-kernel-dev-535ff672e3589a38f60567314bc2ae15b9ab2604.tar.gz | |
Merge branch 'omap-clock-fixes' into omap-fixes
Diffstat (limited to 'arch/arm/plat-omap/include')
| -rw-r--r-- | arch/arm/plat-omap/include/mach/dmtimer.h | 2 | ||||
| -rw-r--r-- | arch/arm/plat-omap/include/mach/timer-gp.h | 17 |
2 files changed, 18 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/include/mach/dmtimer.h b/arch/arm/plat-omap/include/mach/dmtimer.h index 6dc70313..20f1054 100644 --- a/arch/arm/plat-omap/include/mach/dmtimer.h +++ b/arch/arm/plat-omap/include/mach/dmtimer.h @@ -64,7 +64,7 @@ void omap_dm_timer_trigger(struct omap_dm_timer *timer); void omap_dm_timer_start(struct omap_dm_timer *timer); void omap_dm_timer_stop(struct omap_dm_timer *timer); -void omap_dm_timer_set_source(struct omap_dm_timer *timer, int source); +int omap_dm_timer_set_source(struct omap_dm_timer *timer, int source); void omap_dm_timer_set_load(struct omap_dm_timer *timer, int autoreload, unsigned int value); void omap_dm_timer_set_load_start(struct omap_dm_timer *timer, int autoreload, unsigned int value); void omap_dm_timer_set_match(struct omap_dm_timer *timer, int enable, unsigned int match); diff --git a/arch/arm/plat-omap/include/mach/timer-gp.h b/arch/arm/plat-omap/include/mach/timer-gp.h new file mode 100644 index 0000000..c88d346 --- /dev/null +++ b/arch/arm/plat-omap/include/mach/timer-gp.h @@ -0,0 +1,17 @@ +/* + * OMAP2/3 GPTIMER support.headers + * + * Copyright (C) 2009 Nokia Corporation + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file "COPYING" in the main directory of this archive + * for more details. + */ + +#ifndef __ARCH_ARM_PLAT_OMAP_INCLUDE_MACH_TIMER_GP_H +#define __ARCH_ARM_PLAT_OMAP_INCLUDE_MACH_TIMER_GP_H + +int __init omap2_gp_clockevent_set_gptimer(u8 id); + +#endif + |
