Messages in this thread | | | Subject | Re: [PATCH] clocksource/drivers/timer-ti-dm: Do one override clock parent in prepare() | From | Suman Anna <> | Date | Tue, 5 May 2020 11:07:34 -0500 |
| |
On 4/28/20 1:22 PM, Tony Lindgren wrote: > * Lokesh Vutla <lokeshvutla@ti.com> [200427 17:29]: >> omap_dm_timer_prepare() is setting up the parent 32KHz clock. This >> prepare() gets called by request_timer in the client's driver. Because of >> this, the timer clock parent that is set with assigned-clock-parent is being >> overwritten. So drop this default setting of parent in prepare(). >> >> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Reviewed-by: Suman Anna <s-anna@ti.com>
> > This works just fine for me but depends on the dts changes. > > Daniel, for merging, do you want to set up an immutable branch > for the related dts change and this? I'm afraid it will conflict > with the related systimer changes for the dts otherwise. > > Regards, > > Tony > >> --- >> - As per the discussion happened here[0], dropping the default setting. >> [0] https://patchwork.kernel.org/patch/11379875/#23309493 >> >> drivers/clocksource/timer-ti-dm.c | 4 +--- >> 1 file changed, 1 insertion(+), 3 deletions(-) >> >> diff --git a/drivers/clocksource/timer-ti-dm.c b/drivers/clocksource/timer-ti-dm.c >> index 2531eab3d6d7..60aff087947a 100644 >> --- a/drivers/clocksource/timer-ti-dm.c >> +++ b/drivers/clocksource/timer-ti-dm.c >> @@ -258,9 +258,7 @@ static int omap_dm_timer_prepare(struct omap_dm_timer *timer) >> __omap_dm_timer_enable_posted(timer); >> omap_dm_timer_disable(timer); >> >> - rc = omap_dm_timer_set_source(timer, OMAP_TIMER_SRC_32_KHZ); >> - >> - return rc; >> + return 0; >> } >> >> static inline u32 omap_dm_timer_reserved_systimer(int id) >> -- >> 2.23.0 >>
| |