aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap/include/plat/dmtimer.h
diff options
context:
space:
mode:
authorJon Hunter <jon-hunter@ti.com>2012-06-05 13:34:57 -0400
committerTony Lindgren <tony@atomide.com>2012-06-14 05:39:47 -0400
commit6615975bc58a1234bd401a7ff231dae85631fd58 (patch)
treeb914fe87fc136aba2b23c166b540b8cf973adfe0 /arch/arm/plat-omap/include/plat/dmtimer.h
parent0b30ec1cb7f1b0134b16670f886baaf3521b083c (diff)
ARM: OMAP: Add flag to indicate if a timer needs a manual reset
For OMAP1 devices, it is necessary to perform a manual reset of the timer. Currently, this is indicating by setting the "needs_manual_reset" variable in the platform data. Instead of using an extra variable to indicate this add a new timer capabilities flag to indicate this and remove the "needs_manual_reset" member from the platform data. Signed-off-by: Jon Hunter <jon-hunter@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/plat-omap/include/plat/dmtimer.h')
-rw-r--r--arch/arm/plat-omap/include/plat/dmtimer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/include/plat/dmtimer.h b/arch/arm/plat-omap/include/plat/dmtimer.h
index e11c9ea7ec53..c039e84bca7e 100644
--- a/arch/arm/plat-omap/include/plat/dmtimer.h
+++ b/arch/arm/plat-omap/include/plat/dmtimer.h
@@ -59,6 +59,7 @@
59#define OMAP_TIMER_SECURE 0x80000000 59#define OMAP_TIMER_SECURE 0x80000000
60#define OMAP_TIMER_ALWON 0x40000000 60#define OMAP_TIMER_ALWON 0x40000000
61#define OMAP_TIMER_HAS_PWM 0x20000000 61#define OMAP_TIMER_HAS_PWM 0x20000000
62#define OMAP_TIMER_NEEDS_RESET 0x10000000
62 63
63struct omap_timer_capability_dev_attr { 64struct omap_timer_capability_dev_attr {
64 u32 timer_capability; 65 u32 timer_capability;
@@ -90,7 +91,6 @@ struct timer_regs {
90 91
91struct dmtimer_platform_data { 92struct dmtimer_platform_data {
92 int (*set_timer_src)(struct platform_device *pdev, int source); 93 int (*set_timer_src)(struct platform_device *pdev, int source);
93 u32 needs_manual_reset:1;
94 u32 timer_capability; 94 u32 timer_capability;
95}; 95};
96 96