tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'ux500-clksrc-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/drivers
From Linus Walleij:
Ux500 clocksource updates:
- Use relaxed readl() variant
- Fix a single comment
* tag 'ux500-clksrc-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
clocksource: dbx500-prcmu: comment cleanup
clocksource: dbx500-prcmu: use relaxed readl variant
Signed-off-by: Olof Johansson <olof@lixom.net>
+5
-6
+5
-6
drivers/clocksource/clksrc-dbx500-prcmu.c
+5
-6
drivers/clocksource/clksrc-dbx500-prcmu.c
···
10
10
* DBx500-PRCMU Timer
11
11
* The PRCMU has 5 timers which are available in a always-on
12
12
* power domain. We use the Timer 4 for our always-on clock
13
-
* source on DB8500 and Timer 3 on DB5500.
13
+
* source on DB8500.
14
14
*/
15
15
#include <linux/clockchips.h>
16
16
#include <linux/clksrc-dbx500-prcmu.h>
···
30
30
31
31
static void __iomem *clksrc_dbx500_timer_base;
32
32
33
-
static cycle_t clksrc_dbx500_prcmu_read(struct clocksource *cs)
33
+
static cycle_t notrace clksrc_dbx500_prcmu_read(struct clocksource *cs)
34
34
{
35
+
void __iomem *base = clksrc_dbx500_timer_base;
35
36
u32 count, count2;
36
37
37
38
do {
38
-
count = readl(clksrc_dbx500_timer_base +
39
-
PRCMU_TIMER_DOWNCOUNT);
40
-
count2 = readl(clksrc_dbx500_timer_base +
41
-
PRCMU_TIMER_DOWNCOUNT);
39
+
count = readl_relaxed(base + PRCMU_TIMER_DOWNCOUNT);
40
+
count2 = readl_relaxed(base + PRCMU_TIMER_DOWNCOUNT);
42
41
} while (count2 != count);
43
42
44
43
/* Negate because the timer is a decrementing counter */