Commit 1c090991 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge tag 'timers-v5.1-rc6' of... 

Merge tag 'timers-v5.1-rc6' of https://git.linaro.org/people/daniel.lezcano/linux into timers/urgent

Pull clockevent/clocksource fixes from Daniel Lezcano:

 - Fix TIMER_OF missing option dependency for npcm (Arnd Bergmann)

 - Remove a pointless macro call for arm_arch_timer (Yangtao Li)

 - Fix wrong compatible string for oxnas (Neil Armstrong)

 - Fix compilation warning by removing a dead function on omap (Nathan Chancellor)
parents 07d7e120 4d86c9f7

drivers/clocksource/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ config VT8500_TIMER 
config NPCM7XX_TIMER

	bool "NPCM7xx timer driver" if COMPILE_TEST

	depends on HAS_IOMEM

	select TIMER_OF

	select CLKSRC_MMIO

	help

	  Enable 24-bit TIMER0 and TIMER1 counters in the NPCM7xx architecture,

drivers/clocksource/arm_arch_timer.c

+1 −4
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
 * published by the Free Software Foundation.

 */



#define pr_fmt(fmt)	"arm_arch_timer: " fmt

#define pr_fmt(fmt) 	"arch_timer: " fmt



#include <linux/init.h>

#include <linux/kernel.h>
@@ -33,9 +33,6 @@ 


#include <clocksource/arm_arch_timer.h>



#undef pr_fmt

#define pr_fmt(fmt) "arch_timer: " fmt



#define CNTTIDR		0x08

#define CNTTIDR_VIRT(n)	(BIT(1) << ((n) * 4))

drivers/clocksource/timer-oxnas-rps.c

+1 −1
Original line number Diff line number Diff line
@@ -296,4 +296,4 @@ err_alloc: 
TIMER_OF_DECLARE(ox810se_rps,

		       "oxsemi,ox810se-rps-timer", oxnas_rps_timer_init);

TIMER_OF_DECLARE(ox820_rps,

		       "oxsemi,ox820se-rps-timer", oxnas_rps_timer_init);
 
		       "oxsemi,ox820-rps-timer", oxnas_rps_timer_init);

drivers/clocksource/timer-ti-dm.c

+0 −28
Original line number Diff line number Diff line
@@ -585,34 +585,6 @@ static int omap_dm_timer_set_load(struct omap_dm_timer *timer, int autoreload, 
	return 0;

}



/* Optimized set_load which removes costly spin wait in timer_start */

static int omap_dm_timer_set_load_start(struct omap_dm_timer *timer,

					int autoreload, unsigned int load)

{

	u32 l;



	if (unlikely(!timer))

		return -EINVAL;



	omap_dm_timer_enable(timer);



	l = omap_dm_timer_read_reg(timer, OMAP_TIMER_CTRL_REG);

	if (autoreload) {

		l |= OMAP_TIMER_CTRL_AR;

		omap_dm_timer_write_reg(timer, OMAP_TIMER_LOAD_REG, load);

	} else {

		l &= ~OMAP_TIMER_CTRL_AR;

	}

	l |= OMAP_TIMER_CTRL_ST;



	__omap_dm_timer_load_start(timer, l, load, timer->posted);



	/* Save the context */

	timer->context.tclr = l;

	timer->context.tldr = load;

	timer->context.tcrr = load;

	return 0;

}

static int omap_dm_timer_set_match(struct omap_dm_timer *timer, int enable,

				   unsigned int match)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE