brain-hackers_pepepper-mirror
/
linux-brain
mirror of https://github.com/brain-hackers/linux-brain.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clockevent / clocksource fixes update for v5.1-rc6 

- 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)
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEEGn3N4YVz0WNVyHskqDIjiipP6E8FAly1zNEACgkQqDIjiipP
 6E/dPwgAsnmcWVEVB/2ePqfUS3+IYfZEepCLECMFULTGZjlRMI/klvEsXLYU9bOT
 xnltQp+OxYyiV6N8tDQ2Ud0a25G+6wZFqn4zI9rBA8+lBD1RXTRS7jfNwjtfT5sK
 SMSduZrC0kq75+dNk9fQMNHUZfHBh8CFWg14JmpxeM0hXBcXuapBkgoW8sWi3XfP
 LVkqM0/tp1e6kEt7vM6VdTwR4sfsZooebjGyTe92v8GbBqQrMj5CqoF2w2XPZdRe
 KhhtbeuQImKtBgvWnB+bAImxGEyijkAiB8nT8Toi/K0WbQA/Be48PvAsocJBjgbd
 qdnCruAJaLrdxgXBIo9lWvIo/LAgAQ==
 =ZMhx
 -----END PGP SIGNATURE-----

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)
This commit is contained in:
Thomas Gleixner 2019-04-16 15:56:46 +02:00
parent 07d7e12091 4d86c9f73c
commit 1c09099188
4 changed files with 3 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/clocksource/Kconfig
View File

@ -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,

5
drivers/clocksource/arm_arch_timer.c
View File

@ -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))

2
drivers/clocksource/timer-oxnas-rps.c
View File

@ -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);

28
drivers/clocksource/timer-ti-dm.c
View File

@ -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)
{