On 22/01/2019 18:57, Tony Lindgren wrote:
> Commit 84badc5ec5fc ("ARM: dts: omap4: Move l4 child devices to probe
> them with ti-sysc") moved some omap4 timers to probe with ti-sysc
> interconnect target module. Turns out this broke pwm-omap-dmtimer
> where we now try to reparent the clock to itself with the following:
>
> omap_dm_timer_of_set_source: failed to set parent
>
> With ti-sysc, we can now configure the clock sources in the dts
> with assigned-clocks and assigned-clock-parents. So we should be able
> to remove omap_dm_timer_of_set_source with clean-up patches later on.
> But for now, let's just fix it first by checking if parent and fck
> are the same and bail out of so.
>
> Fixes: 84badc5ec5fc ("ARM: dts: omap4: Move l4 child devices to probe
> them with ti-sysc")
> Cc: Bartosz Golaszewski <bgolaszew...@baylibre.com>
> Cc: Daniel Lezcano <daniel.lezc...@linaro.org>
> Cc: H. Nikolaus Schaller <h...@goldelico.com>
> Cc: Keerthy <j-keer...@ti.com>
> Cc: Ladislav Michl <la...@linux-mips.org>
> Cc: Pavel Machek <pa...@ucw.cz>
> Cc: Sebastian Reichel <s...@kernel.org>
> Cc: Tero Kristo <t-kri...@ti.com>
> Cc: Thierry Reding <thierry.red...@gmail.com>
> Cc: Thomas Gleixner <t...@linutronix.de>
> Reported-by: H. Nikolaus Schaller <h...@goldelico.com>
> Signed-off-by: Tony Lindgren <t...@atomide.com>
> ---
Do you want me to take it through my tree (1 et 3)?
> drivers/clocksource/timer-ti-dm.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/clocksource/timer-ti-dm.c
> b/drivers/clocksource/timer-ti-dm.c
> --- 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__);
>
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
