summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPavel Machek <pavel@denx.de>2013-05-07 22:11:26 +0200
committerJohn Stultz <john.stultz@linaro.org>2013-05-28 14:00:58 -0700
commit55a68c23e0a675b2b8ac2656fd6edbf98b78e4c6 (patch)
treeb36789476bf234c322f8200dc26b040f9abd80ee /include
parent35b210855069ae34450eeaafc0f1b5bfa4f71c87 (diff)
downloadlinux-55a68c23e0a675b2b8ac2656fd6edbf98b78e4c6.tar.gz
linux-55a68c23e0a675b2b8ac2656fd6edbf98b78e4c6.tar.xz
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')
-rw-r--r--include/linux/dw_apb_timer.h6
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 @@
#include <linux/clocksource.h>
#include <linux/interrupt.h>
+#define APBTMR_N_LOAD_COUNT 0x00
+#define APBTMR_N_CURRENT_VALUE 0x04
+#define APBTMR_N_CONTROL 0x08
+#define APBTMR_N_EOI 0x0c
+#define APBTMR_N_INT_STATUS 0x10
+
#define APBTMRS_REG_SIZE 0x14
struct dw_apb_timer {