diff options
author | Robert Jarzmik <robert.jarzmik@free.fr> | 2014-07-14 12:52:04 -0400 |
---|---|---|
committer | Daniel Lezcano <daniel.lezcano@linaro.org> | 2014-07-23 06:02:39 -0400 |
commit | a38b1f60b5245a3f610baac2019c0ecd8abd8752 (patch) | |
tree | b2c0bc7321f1356e6036e687f202b4d2dcbd0cb8 /arch/arm/mach-pxa/generic.c | |
parent | 6f6caeaa9a27eb97a15a707192db601a8ef6c272 (diff) |
ARM: pxa: Add non device-tree timer link to clocksource
As clocksource pxa_timer was moved to clocksource framework, the
pxa_timer initialization needs to be a bit amended, to pass the
necessary informations to clocksource, ie :
- the timer interrupt (mach specific)
- the timer registers base (ditto)
- the timer clockrate
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Diffstat (limited to 'arch/arm/mach-pxa/generic.c')
-rw-r--r-- | arch/arm/mach-pxa/generic.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c index 42254175fcf4..6f38e1af45af 100644 --- a/arch/arm/mach-pxa/generic.c +++ b/arch/arm/mach-pxa/generic.c | |||
@@ -25,11 +25,13 @@ | |||
25 | #include <asm/mach/map.h> | 25 | #include <asm/mach/map.h> |
26 | #include <asm/mach-types.h> | 26 | #include <asm/mach-types.h> |
27 | 27 | ||
28 | #include <mach/irqs.h> | ||
28 | #include <mach/reset.h> | 29 | #include <mach/reset.h> |
29 | #include <mach/smemc.h> | 30 | #include <mach/smemc.h> |
30 | #include <mach/pxa3xx-regs.h> | 31 | #include <mach/pxa3xx-regs.h> |
31 | 32 | ||
32 | #include "generic.h" | 33 | #include "generic.h" |
34 | #include <clocksource/pxa.h> | ||
33 | 35 | ||
34 | void clear_reset_status(unsigned int mask) | 36 | void clear_reset_status(unsigned int mask) |
35 | { | 37 | { |
@@ -57,6 +59,15 @@ unsigned long get_clock_tick_rate(void) | |||
57 | EXPORT_SYMBOL(get_clock_tick_rate); | 59 | EXPORT_SYMBOL(get_clock_tick_rate); |
58 | 60 | ||
59 | /* | 61 | /* |
62 | * For non device-tree builds, keep legacy timer init | ||
63 | */ | ||
64 | void pxa_timer_init(void) | ||
65 | { | ||
66 | pxa_timer_nodt_init(IRQ_OST0, io_p2v(0x40a00000), | ||
67 | get_clock_tick_rate()); | ||
68 | } | ||
69 | |||
70 | /* | ||
60 | * Get the clock frequency as reflected by CCCR and the turbo flag. | 71 | * Get the clock frequency as reflected by CCCR and the turbo flag. |
61 | * We assume these values have been applied via a fcs. | 72 | * We assume these values have been applied via a fcs. |
62 | * If info is not 0 we also display the current settings. | 73 | * If info is not 0 we also display the current settings. |