Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 864f893f authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'clockevents/4.19-fixes' of... 

Merge branch 'clockevents/4.19-fixes' of https://git.linaro.org/people/daniel.lezcano/linux into timers/urgent

Pull clockevent fixed from Daniel Lezcano:

 - Add the CLOCK_SOURCE_SUSPEND_NONSTOP for non-am43 SoCs (Keerthy)

 - Fix set_next_event handler for the fttmr010 (Tao Ren)
parents 6bf4ca7f 4451d3f5

drivers/clocksource/timer-fttmr010.c

+11 −7
Original line number Diff line number Diff line
@@ -130,13 +130,17 @@ static int fttmr010_timer_set_next_event(unsigned long cycles, 
	cr &= ~fttmr010->t1_enable_val;

	writel(cr, fttmr010->base + TIMER_CR);



	/* Setup the match register forward/backward in time */

	if (fttmr010->count_down) {

		/*

		 * ASPEED Timer Controller will load TIMER1_LOAD register

		 * into TIMER1_COUNT register when the timer is re-enabled.

		 */

		writel(cycles, fttmr010->base + TIMER1_LOAD);

	} else {

		/* Setup the match register forward in time */

		cr = readl(fttmr010->base + TIMER1_COUNT);

	if (fttmr010->count_down)

		cr -= cycles;

	else

		cr += cycles;

	writel(cr, fttmr010->base + TIMER1_MATCH1);

		writel(cr + cycles, fttmr010->base + TIMER1_MATCH1);

	}



	/* Start */

	cr = readl(fttmr010->base + TIMER_CR);

drivers/clocksource/timer-ti-32k.c

+3 −0
Original line number Diff line number Diff line
@@ -97,6 +97,9 @@ static int __init ti_32k_timer_init(struct device_node *np) 
		return -ENXIO;

	}



	if (!of_machine_is_compatible("ti,am43"))

		ti_32k_timer.cs.flags |= CLOCK_SOURCE_SUSPEND_NONSTOP;



	ti_32k_timer.counter = ti_32k_timer.base;



	/*