Browse Source

Merge branch 'omap-for-v.16/dmtimer-fix' into omap-for-v4.17/timer

Tony Lindgren 7 years ago
parent
commit
2fdc82776a
1 changed files with 2 additions and 5 deletions
  1. 2 5
      arch/arm/plat-omap/dmtimer.c

+ 2 - 5
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);