提交 2fdc8277 编写于 作者: T Tony Lindgren

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

...@@ -888,11 +888,8 @@ static int omap_dm_timer_probe(struct platform_device *pdev) ...@@ -888,11 +888,8 @@ static int omap_dm_timer_probe(struct platform_device *pdev)
timer->irq = irq->start; timer->irq = irq->start;
timer->pdev = pdev; timer->pdev = pdev;
/* Skip pm_runtime_enable for OMAP1 */
if (!(timer->capability & OMAP_TIMER_NEEDS_RESET)) {
pm_runtime_enable(dev); pm_runtime_enable(dev);
pm_runtime_irq_safe(dev); pm_runtime_irq_safe(dev);
}
if (!timer->reserved) { if (!timer->reserved) {
ret = pm_runtime_get_sync(dev); ret = pm_runtime_get_sync(dev);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册