summaryrefslogtreecommitdiff
path: root/arch/arm/cpu/pxa/timer.c
diff options
context:
space:
mode:
authorMarek Vasut <marek.vasut@gmail.com>2010-09-09 09:50:39 +0200
committerWolfgang Denk <wd@denx.de>2010-10-19 22:46:22 +0200
commit3ba8bf7c6d6c09b9823b08b03d2d155907313238 (patch)
treedcb9243cd47eb640e306ba6eba658e14b7429809 /arch/arm/cpu/pxa/timer.c
parent9f80a20e05f20ab6b20be3addee969e1306ee3d5 (diff)
downloadu-boot-imx-3ba8bf7c6d6c09b9823b08b03d2d155907313238.zip
u-boot-imx-3ba8bf7c6d6c09b9823b08b03d2d155907313238.tar.gz
u-boot-imx-3ba8bf7c6d6c09b9823b08b03d2d155907313238.tar.bz2
PXA: pxa-regs.h cleanup
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Diffstat (limited to 'arch/arm/cpu/pxa/timer.c')
-rw-r--r--arch/arm/cpu/pxa/timer.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/cpu/pxa/timer.c b/arch/arm/cpu/pxa/timer.c
index 8d0f826..ec950c7 100644
--- a/arch/arm/cpu/pxa/timer.c
+++ b/arch/arm/cpu/pxa/timer.c
@@ -26,8 +26,9 @@
* MA 02111-1307 USA
*/
-#include <common.h>
#include <asm/arch/pxa-regs.h>
+#include <asm/io.h>
+#include <common.h>
#include <div64.h>
#ifdef CONFIG_USE_IRQ
@@ -86,7 +87,7 @@ void __udelay (unsigned long usec)
void reset_timer_masked (void)
{
- OSCR = 0;
+ writel(0, OSCR);
}
ulong get_timer_masked (void)
@@ -113,7 +114,7 @@ void udelay_masked (unsigned long usec)
*/
unsigned long long get_ticks(void)
{
- return OSCR;
+ return readl(OSCR);
}
/*