diff options
author | Tony Lindgren <tony@atomide.com> | 2011-09-21 19:38:51 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-09-21 19:38:51 -0400 |
commit | 0dad9faeaeb0fa3524068a94e1745b91e5597c17 (patch) | |
tree | 2dbe24ec9964d605ea39756ed320524901324f17 /arch/arm/plat-omap/include/plat/dmtimer.h | |
parent | ffe07ceae1ae4b00b776c59694eddd9dd615dcea (diff) |
ARM: OMAP: dmtimer: skip reserved timers
Pass the reserved flag in pdata and use it. We can
now make sys_timer_reserved static to mach-omap2/timer.c.
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.h | 2 |
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 4e3a32609ab..29764c34f57 100644 --- a/arch/arm/plat-omap/include/plat/dmtimer.h +++ b/arch/arm/plat-omap/include/plat/dmtimer.h | |||
@@ -77,6 +77,7 @@ struct dmtimer_platform_data { | |||
77 | int (*set_timer_src)(struct platform_device *pdev, int source); | 77 | int (*set_timer_src)(struct platform_device *pdev, int source); |
78 | int timer_ip_version; | 78 | int timer_ip_version; |
79 | u32 needs_manual_reset:1; | 79 | u32 needs_manual_reset:1; |
80 | bool reserved; | ||
80 | }; | 81 | }; |
81 | 82 | ||
82 | struct omap_dm_timer *omap_dm_timer_request(void); | 83 | struct omap_dm_timer *omap_dm_timer_request(void); |
@@ -248,7 +249,6 @@ struct omap_dm_timer { | |||
248 | struct list_head node; | 249 | struct list_head node; |
249 | }; | 250 | }; |
250 | 251 | ||
251 | extern u32 sys_timer_reserved; | ||
252 | int omap_dm_timer_prepare(struct omap_dm_timer *timer); | 252 | int omap_dm_timer_prepare(struct omap_dm_timer *timer); |
253 | 253 | ||
254 | static inline u32 __omap_dm_timer_read(struct omap_dm_timer *timer, u32 reg, | 254 | static inline u32 __omap_dm_timer_read(struct omap_dm_timer *timer, u32 reg, |