summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2018-02-22 10:46:47 -0800
committerTony Lindgren <tony@atomide.com>2018-02-22 10:46:47 -0800
commit2fdc82776ac2ac49c5ee666d834718ac36420e49 (patch)
treed64dd317e6c5542505831f2aed5ef6d890c14351 /arch/arm/plat-omap
parent1ff4cb677dcac953514473971866a791400bbc5a (diff)
parentba6887836178d43b3665b9da075c2c5dfe1d207c (diff)
downloadlinux-2fdc82776ac2ac49c5ee666d834718ac36420e49.tar.bz2
Merge branch 'omap-for-v.16/dmtimer-fix' into omap-for-v4.17/timer
Diffstat (limited to 'arch/arm/plat-omap')
-rw-r--r--arch/arm/plat-omap/dmtimer.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c
index d443e481c3e9..8805a59bae53 100644
--- a/arch/arm/plat-omap/dmtimer.c
+++ b/arch/arm/plat-omap/dmtimer.c
@@ -888,11 +888,8 @@ static int omap_dm_timer_probe(struct platform_device *pdev)
timer->irq = irq->start;
timer->pdev = pdev;
- /* Skip pm_runtime_enable for OMAP1 */
- if (!(timer->capability & OMAP_TIMER_NEEDS_RESET)) {
- pm_runtime_enable(dev);
- pm_runtime_irq_safe(dev);
- }
+ pm_runtime_enable(dev);
+ pm_runtime_irq_safe(dev);
if (!timer->reserved) {
ret = pm_runtime_get_sync(dev);