diff options
| author | Tony Lindgren <tony@atomide.com> | 2019-01-29 07:53:47 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2019-01-29 07:53:47 -0800 |
| commit | 072167d13ce46d5fcef1a80a53a667a46c9b17e7 (patch) | |
| tree | d978e8c7d523702d8da2964c02a10f3301015847 /drivers/clocksource | |
| parent | d0243693fbf6fbd48b4efb2ba7210765983b03e3 (diff) | |
| parent | 0840242e887586268f665bf58d5e1a7d6ebf35ed (diff) | |
| download | lwn-072167d13ce46d5fcef1a80a53a667a46c9b17e7.tar.gz lwn-072167d13ce46d5fcef1a80a53a667a46c9b17e7.zip | |
Merge branch 'pwm-dmtimer-fixes' into omap-for-v5.0/fixes-v2
Diffstat (limited to 'drivers/clocksource')
| -rw-r--r-- | drivers/clocksource/timer-ti-dm.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/clocksource/timer-ti-dm.c b/drivers/clocksource/timer-ti-dm.c index 595124074821..c364027638e1 100644 --- a/drivers/clocksource/timer-ti-dm.c +++ b/drivers/clocksource/timer-ti-dm.c @@ -154,6 +154,10 @@ static int omap_dm_timer_of_set_source(struct omap_dm_timer *timer) if (IS_ERR(parent)) return -ENODEV; + /* Bail out if both clocks point to fck */ + if (clk_is_match(parent, timer->fclk)) + return 0; + ret = clk_set_parent(timer->fclk, parent); if (ret < 0) pr_err("%s: failed to set parent\n", __func__); @@ -864,7 +868,6 @@ static int omap_dm_timer_probe(struct platform_device *pdev) timer->pdev = pdev; pm_runtime_enable(dev); - pm_runtime_irq_safe(dev); if (!timer->reserved) { ret = pm_runtime_get_sync(dev); |