diff options
author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2014-12-21 10:08:13 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-01-14 06:28:37 -0500 |
commit | 7a8ca0a0c480fedf91bdbadf8b90edd5374ce18b (patch) | |
tree | 434690a72aa0eeba7014e728ad01d9a407840e1b /arch/arm/mach-sa1100/generic.c | |
parent | e074ff86e8b4f4f7983ff9b752bc904c8a729900 (diff) |
ARM: 8252/1: sa1100: use pxa_timer clocksource driver
Use pxa_timer clocksource driver.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-sa1100/generic.c')
-rw-r--r-- | arch/arm/mach-sa1100/generic.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-sa1100/generic.c b/arch/arm/mach-sa1100/generic.c index d4ea142c4edd..40e0d8619a2d 100644 --- a/arch/arm/mach-sa1100/generic.c +++ b/arch/arm/mach-sa1100/generic.c | |||
@@ -33,6 +33,7 @@ | |||
33 | #include <mach/irqs.h> | 33 | #include <mach/irqs.h> |
34 | 34 | ||
35 | #include "generic.h" | 35 | #include "generic.h" |
36 | #include <clocksource/pxa.h> | ||
36 | 37 | ||
37 | unsigned int reset_status; | 38 | unsigned int reset_status; |
38 | EXPORT_SYMBOL(reset_status); | 39 | EXPORT_SYMBOL(reset_status); |
@@ -369,6 +370,11 @@ void __init sa1100_map_io(void) | |||
369 | iotable_init(standard_io_desc, ARRAY_SIZE(standard_io_desc)); | 370 | iotable_init(standard_io_desc, ARRAY_SIZE(standard_io_desc)); |
370 | } | 371 | } |
371 | 372 | ||
373 | void __init sa1100_timer_init(void) | ||
374 | { | ||
375 | pxa_timer_nodt_init(IRQ_OST0, io_p2v(0x90000000), 3686400); | ||
376 | } | ||
377 | |||
372 | /* | 378 | /* |
373 | * Disable the memory bus request/grant signals on the SA1110 to | 379 | * Disable the memory bus request/grant signals on the SA1110 to |
374 | * ensure that we don't receive spurious memory requests. We set | 380 | * ensure that we don't receive spurious memory requests. We set |