OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'dropmachtimexh-v2' of git://git.pengutronix.de/git/ukl/linux
[uclinux-h8/linux.git]
/
arch
/
arm
/
mach-sa1100
/
time.c
diff --git
a/arch/arm/mach-sa1100/time.c
b/arch/arm/mach-sa1100/time.c
index
b4e7f2d
..
7aaac00
100644
(file)
--- a/
arch/arm/mach-sa1100/time.c
+++ b/
arch/arm/mach-sa1100/time.c
@@
-24,7
+24,7
@@
#define SA1100_CLOCK_FREQ 3686400
#define SA1100_LATCH DIV_ROUND_CLOSEST(SA1100_CLOCK_FREQ, HZ)
#define SA1100_CLOCK_FREQ 3686400
#define SA1100_LATCH DIV_ROUND_CLOSEST(SA1100_CLOCK_FREQ, HZ)
-static u
32
notrace sa1100_read_sched_clock(void)
+static u
64
notrace sa1100_read_sched_clock(void)
{
return readl_relaxed(OSCR);
}
{
return readl_relaxed(OSCR);
}
@@
-126,7
+126,7
@@
void __init sa1100_timer_init(void)
writel_relaxed(0, OIER);
writel_relaxed(OSSR_M0 | OSSR_M1 | OSSR_M2 | OSSR_M3, OSSR);
writel_relaxed(0, OIER);
writel_relaxed(OSSR_M0 | OSSR_M1 | OSSR_M2 | OSSR_M3, OSSR);
- s
etup_sched_clock
(sa1100_read_sched_clock, 32, 3686400);
+ s
ched_clock_register
(sa1100_read_sched_clock, 32, 3686400);
ckevt_sa1100_osmr0.cpumask = cpumask_of(0);
ckevt_sa1100_osmr0.cpumask = cpumask_of(0);