clocksource/drivers/timer-microchip-pit64b: Use mchp_pit64b_{suspend, resume}

Use mchp_pit64b_suspend() and mchp_pit64b_resume() to disable or
enable timers clocks on init and remove specific
clk_prepare_{disable, enable} calls. This is ok also for clockevent timer
as proper clock enable, disable is done on .set_state_oneshot,
.set_state_periodic, .set_state_shutdown calls.

Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Link: https://lore.kernel.org/r/20220609094041.1796372-3-claudiu.beznea@microchip.com
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>

diff --git a/drivers/clocksource/timer-microchip-pit64b.c b/drivers/clocksource/timer-microchip-pit64b.c
index b51259395ac38d2ab04da95cae044f8596638f3f..f50705698283f3e6a1fc537c4b8cd6f43039f48d 100644 (file)
--- a/drivers/clocksource/timer-microchip-pit64b.c
+++ b/drivers/clocksource/timer-microchip-pit64b.c
@@ -344,6 +344,7 @@ static int __init mchp_pit64b_init_clksrc(struct mchp_pit64b_timer *timer,
        if (!cs)
                return -ENOMEM;
 
+       mchp_pit64b_resume(timer);
        mchp_pit64b_reset(timer, ULLONG_MAX, MCHP_PIT64B_MR_CONT, 0);
 
        mchp_pit64b_cs_base = timer->base;
@@ -365,8 +366,7 @@ static int __init mchp_pit64b_init_clksrc(struct mchp_pit64b_timer *timer,
                pr_debug("clksrc: Failed to register PIT64B clocksource!\n");
 
                /* Stop timer. */
-               writel_relaxed(MCHP_PIT64B_CR_SWRST,
-                              timer->base + MCHP_PIT64B_CR);
+               mchp_pit64b_suspend(timer);
                kfree(cs);
 
                return ret;
@@ -450,19 +450,10 @@ static int __init mchp_pit64b_dt_init_timer(struct device_node *node,
        if (ret)
                goto irq_unmap;
 
-       ret = clk_prepare_enable(timer.pclk);
-       if (ret)
-               goto irq_unmap;
-
-       if (timer.mode & MCHP_PIT64B_MR_SGCLK) {
-               ret = clk_prepare_enable(timer.gclk);
-               if (ret)
-                       goto pclk_unprepare;
-
+       if (timer.mode & MCHP_PIT64B_MR_SGCLK)
                clk_rate = clk_get_rate(timer.gclk);
-       } else {
+       else
                clk_rate = clk_get_rate(timer.pclk);
-       }
        clk_rate = clk_rate / (MCHP_PIT64B_MODE_TO_PRES(timer.mode) + 1);
 
        if (clkevt)
@@ -471,15 +462,10 @@ static int __init mchp_pit64b_dt_init_timer(struct device_node *node,
                ret = mchp_pit64b_init_clksrc(&timer, clk_rate);
 
        if (ret)
-               goto gclk_unprepare;
+               goto irq_unmap;
 
        return 0;
 
-gclk_unprepare:
-       if (timer.mode & MCHP_PIT64B_MR_SGCLK)
-               clk_disable_unprepare(timer.gclk);
-pclk_unprepare:
-       clk_disable_unprepare(timer.pclk);
 irq_unmap:
        irq_dispose_mapping(irq);
 io_unmap: