diff options
| author |   Jon Hunter <jon-hunter@ti.com> | 2012-06-05 12:34:57 -0500 |
|---|---|---|
| committer |   Tony Lindgren <tony@atomide.com> | 2012-06-14 02:39:47 -0700 |
| commit | 6615975bc58a1234bd401a7ff231dae85631fd58 (patch) | |
| tree | b914fe87fc136aba2b23c166b540b8cf973adfe0 /arch/arm/mach-omap1/timer.c | |
| parent | ARM: OMAP: Remove timer function pointer for context loss counter (diff) | |
| download | linux-dev-6615975bc58a1234bd401a7ff231dae85631fd58.tar.xz linux-dev-6615975bc58a1234bd401a7ff231dae85631fd58.zip | |
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/mach-omap1/timer.c')
| -rw-r--r-- | arch/arm/mach-omap1/timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/timer.c b/arch/arm/mach-omap1/timer.c index b4bf48c188fb..aa81593db1af 100644 --- a/arch/arm/mach-omap1/timer.c +++ b/arch/arm/mach-omap1/timer.c @@ -140,8 +140,8 @@ static int __init omap1_dm_timer_init(void) } pdata->set_timer_src = omap1_dm_timer_set_src; - pdata->needs_manual_reset = 1; - pdata->timer_capability = OMAP_TIMER_ALWON; + pdata->timer_capability = OMAP_TIMER_ALWON | + OMAP_TIMER_NEEDS_RESET; ret = platform_device_add_data(pdev, pdata, sizeof(*pdata)); if (ret) { |