diff options
| author | Pavel Machek <pavel@denx.de> | 2013-05-07 16:11:26 -0400 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-05-28 17:00:58 -0400 |
| commit | 55a68c23e0a675b2b8ac2656fd6edbf98b78e4c6 (patch) | |
| tree | b36789476bf234c322f8200dc26b040f9abd80ee /include/linux | |
| parent | 35b210855069ae34450eeaafc0f1b5bfa4f71c87 (diff) | |
dw_apb_timer_of.c: Remove parts that were picoxcell-specific
It seems we made a mistake when creating dw_apb_timer_of.c:
picoxcell sched_clock had parts that were not related to
dw_apb_timer, yet we moved them to dw_apb_timer_of, and tried to
use them on socfpga.
This results in system where user/system time is not measured
properly, as demonstrated by
time dd if=/dev/urandom of=/dev/zero bs=100000 count=100
So this patch switches sched_clock to hardware that exists on both
platforms, and adds missing of_node_put() in dw_apb_timer_init().
Signed-off-by: Pavel Machek <pavel@denx.de>
Acked-by: Jamie Iles <jamie@jamieiles.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/dw_apb_timer.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/dw_apb_timer.h b/include/linux/dw_apb_timer.h index b1cd9597c241..de0904e38f33 100644 --- a/include/linux/dw_apb_timer.h +++ b/include/linux/dw_apb_timer.h | |||
| @@ -17,6 +17,12 @@ | |||
| 17 | #include <linux/clocksource.h> | 17 | #include <linux/clocksource.h> |
| 18 | #include <linux/interrupt.h> | 18 | #include <linux/interrupt.h> |
| 19 | 19 | ||
| 20 | #define APBTMR_N_LOAD_COUNT 0x00 | ||
| 21 | #define APBTMR_N_CURRENT_VALUE 0x04 | ||
| 22 | #define APBTMR_N_CONTROL 0x08 | ||
| 23 | #define APBTMR_N_EOI 0x0c | ||
| 24 | #define APBTMR_N_INT_STATUS 0x10 | ||
| 25 | |||
| 20 | #define APBTMRS_REG_SIZE 0x14 | 26 | #define APBTMRS_REG_SIZE 0x14 |
| 21 | 27 | ||
| 22 | struct dw_apb_timer { | 28 | struct dw_apb_timer { |
