summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm
diff options
context:
space:
mode:
authorStephen Warren <swarren@wwwdotorg.org>2013-03-27 18:43:23 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-04-04 08:14:54 +0200
commit5eaa215607c8668bfa6a7183407eba8fec63d648 (patch)
tree84315e219ce066489ef830231a595f2427470dde /arch/arm/include/asm
parent009d75ccc11d27b9a083375a88bb93cb746b4800 (diff)
downloadtalos-obmc-uboot-5eaa215607c8668bfa6a7183407eba8fec63d648.tar.gz
talos-obmc-uboot-5eaa215607c8668bfa6a7183407eba8fec63d648.zip
ARM: bcm2835: fix get_timer() to return ms
Apparently, CONFIG_SYS_HZ must be 1000. Change this, and fix the timer driver to conform to this. Have the timer implementation export a custom API get_timer_us() for use by the BCM2835 MMC API, which needs us resolution for a HW workaround. Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
Diffstat (limited to 'arch/arm/include/asm')
-rw-r--r--arch/arm/include/asm/arch-bcm2835/timer.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/include/asm/arch-bcm2835/timer.h b/arch/arm/include/asm/arch-bcm2835/timer.h
index 30c70e03df..c2001b6f93 100644
--- a/arch/arm/include/asm/arch-bcm2835/timer.h
+++ b/arch/arm/include/asm/arch-bcm2835/timer.h
@@ -34,4 +34,6 @@ struct bcm2835_timer_regs {
#define BCM2835_TIMER_CS_M1 (1 << 1)
#define BCM2835_TIMER_CS_M0 (1 << 0)
+extern ulong get_timer_us(ulong base);
+
#endif
OpenPOWER on IntegriCloud