| From foo@baz Sun May 27 17:33:38 CEST 2018 |
| From: Tony Lindgren <tony@atomide.com> |
| Date: Thu, 22 Feb 2018 10:02:49 -0800 |
| Subject: ARM: OMAP: Fix dmtimer init for omap1 |
| |
| From: Tony Lindgren <tony@atomide.com> |
| |
| [ Upstream commit ba6887836178d43b3665b9da075c2c5dfe1d207c ] |
| |
| We need to enable PM runtime on omap1 also as otherwise we |
| will get errors: |
| |
| omap_timer omap_timer.1: omap_dm_timer_probe: pm_runtime_get_sync failed! |
| omap_timer: probe of omap_timer.1 failed with error -13 |
| ... |
| |
| We are checking for OMAP_TIMER_NEEDS_RESET flag elsewhere so this is |
| safe to do. |
| |
| Cc: Aaro Koskinen <aaro.koskinen@iki.fi> |
| Cc: Keerthy <j-keerthy@ti.com> |
| Cc: Ladislav Michl <ladis@linux-mips.org> |
| Signed-off-by: Tony Lindgren <tony@atomide.com> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| arch/arm/plat-omap/dmtimer.c | 7 ++----- |
| 1 file changed, 2 insertions(+), 5 deletions(-) |
| |
| --- a/arch/arm/plat-omap/dmtimer.c |
| +++ b/arch/arm/plat-omap/dmtimer.c |
| @@ -890,11 +890,8 @@ static int omap_dm_timer_probe(struct pl |
| 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); |
