[tip: timers/core] clocksource/drivers/timer-ti-dm: Do one override clock parent in prepare()

[tip-bot2 for Lokesh Vutla]

The following commit has been merged into the timers/core branch of tip:

Commit-ID:     264418e20d1fedbed8ad79683b63caa3d72c3b2e
Gitweb:        https://git.kernel.org/tip/264418e20d1fedbed8ad79683b63caa3d72c3b2e
Author:        Lokesh Vutla <lokeshvutla@xxxxxx>
AuthorDate:    Mon, 27 Apr 2020 22:58:31 +05:30
Committer:     Daniel Lezcano <daniel.lezcano@xxxxxxxxxx>
CommitterDate: Sat, 23 May 2020 00:02:05 +02:00

clocksource/drivers/timer-ti-dm: Do one override clock parent in prepare()

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@xxxxxx>
Reviewed-by: Suman Anna <s-anna@xxxxxx>
Acked-by: Tony Lindgren <tony@xxxxxxxxxxx>
Signed-off-by: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20200427172831.16546-1-lokeshvutla@xxxxxx
---
 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 2531eab..60aff08 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)