Commit 2c9c4c9e authored by Claudiu Beznea's avatar Claudiu Beznea Committed by Daniel Lezcano

clocksource/drivers/timer-microchip-pit64b: Remove suspend/resume ops for ce

Remove suspend and resume ops for clockevent and add set_state_oneshot()
instead. Along with this mchp_pit64b_{suspend, resume}() were called on
proper function to disable/enable clocks. This will allow disabling clocks
for clockevent in case it is not selected as active clockevent.
Signed-off-by: default avatarClaudiu Beznea <claudiu.beznea@microchip.com>
Link: https://lore.kernel.org/r/20220609094041.1796372-2-claudiu.beznea@microchip.comSigned-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent 5b2ca9bc
...@@ -173,7 +173,8 @@ static int mchp_pit64b_clkevt_shutdown(struct clock_event_device *cedev) ...@@ -173,7 +173,8 @@ static int mchp_pit64b_clkevt_shutdown(struct clock_event_device *cedev)
{ {
struct mchp_pit64b_timer *timer = clkevt_to_mchp_pit64b_timer(cedev); struct mchp_pit64b_timer *timer = clkevt_to_mchp_pit64b_timer(cedev);
writel_relaxed(MCHP_PIT64B_CR_SWRST, timer->base + MCHP_PIT64B_CR); if (!clockevent_state_detached(cedev))
mchp_pit64b_suspend(timer);
return 0; return 0;
} }
...@@ -182,35 +183,37 @@ static int mchp_pit64b_clkevt_set_periodic(struct clock_event_device *cedev) ...@@ -182,35 +183,37 @@ static int mchp_pit64b_clkevt_set_periodic(struct clock_event_device *cedev)
{ {
struct mchp_pit64b_timer *timer = clkevt_to_mchp_pit64b_timer(cedev); struct mchp_pit64b_timer *timer = clkevt_to_mchp_pit64b_timer(cedev);
if (clockevent_state_shutdown(cedev))
mchp_pit64b_resume(timer);
mchp_pit64b_reset(timer, mchp_pit64b_ce_cycles, MCHP_PIT64B_MR_CONT, mchp_pit64b_reset(timer, mchp_pit64b_ce_cycles, MCHP_PIT64B_MR_CONT,
MCHP_PIT64B_IER_PERIOD); MCHP_PIT64B_IER_PERIOD);
return 0; return 0;
} }
static int mchp_pit64b_clkevt_set_next_event(unsigned long evt, static int mchp_pit64b_clkevt_set_oneshot(struct clock_event_device *cedev)
struct clock_event_device *cedev)
{ {
struct mchp_pit64b_timer *timer = clkevt_to_mchp_pit64b_timer(cedev); struct mchp_pit64b_timer *timer = clkevt_to_mchp_pit64b_timer(cedev);
mchp_pit64b_reset(timer, evt, MCHP_PIT64B_MR_ONE_SHOT, if (clockevent_state_shutdown(cedev))
mchp_pit64b_resume(timer);
mchp_pit64b_reset(timer, mchp_pit64b_ce_cycles, MCHP_PIT64B_MR_ONE_SHOT,
MCHP_PIT64B_IER_PERIOD); MCHP_PIT64B_IER_PERIOD);
return 0; return 0;
} }
static void mchp_pit64b_clkevt_suspend(struct clock_event_device *cedev) static int mchp_pit64b_clkevt_set_next_event(unsigned long evt,
struct clock_event_device *cedev)
{ {
struct mchp_pit64b_timer *timer = clkevt_to_mchp_pit64b_timer(cedev); struct mchp_pit64b_timer *timer = clkevt_to_mchp_pit64b_timer(cedev);
mchp_pit64b_suspend(timer); mchp_pit64b_reset(timer, evt, MCHP_PIT64B_MR_ONE_SHOT,
} MCHP_PIT64B_IER_PERIOD);
static void mchp_pit64b_clkevt_resume(struct clock_event_device *cedev)
{
struct mchp_pit64b_timer *timer = clkevt_to_mchp_pit64b_timer(cedev);
mchp_pit64b_resume(timer); return 0;
} }
static irqreturn_t mchp_pit64b_interrupt(int irq, void *dev_id) static irqreturn_t mchp_pit64b_interrupt(int irq, void *dev_id)
...@@ -395,9 +398,8 @@ static int __init mchp_pit64b_init_clkevt(struct mchp_pit64b_timer *timer, ...@@ -395,9 +398,8 @@ static int __init mchp_pit64b_init_clkevt(struct mchp_pit64b_timer *timer,
ce->clkevt.rating = 150; ce->clkevt.rating = 150;
ce->clkevt.set_state_shutdown = mchp_pit64b_clkevt_shutdown; ce->clkevt.set_state_shutdown = mchp_pit64b_clkevt_shutdown;
ce->clkevt.set_state_periodic = mchp_pit64b_clkevt_set_periodic; ce->clkevt.set_state_periodic = mchp_pit64b_clkevt_set_periodic;
ce->clkevt.set_state_oneshot = mchp_pit64b_clkevt_set_oneshot;
ce->clkevt.set_next_event = mchp_pit64b_clkevt_set_next_event; ce->clkevt.set_next_event = mchp_pit64b_clkevt_set_next_event;
ce->clkevt.suspend = mchp_pit64b_clkevt_suspend;
ce->clkevt.resume = mchp_pit64b_clkevt_resume;
ce->clkevt.cpumask = cpumask_of(0); ce->clkevt.cpumask = cpumask_of(0);
ce->clkevt.irq = irq; ce->clkevt.irq = irq;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment