summaryrefslogtreecommitdiff
path: root/cpu/pxa/interrupts.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-03-15 22:08:07 +0100
committerWolfgang Denk <wd@denx.de>2009-03-15 22:08:07 +0100
commitcd309029f2b8a1a09c484c5766e897b8791c7cfe (patch)
tree9315a042facd7a9eb26c896141fc837c837abc07 /cpu/pxa/interrupts.c
parentf949bd8d089ec3059c460ac829c0d919e1d7af0e (diff)
parenta922fdb87af25c25c032424908dcf60fbf3250ea (diff)
downloadu-boot-imx-cd309029f2b8a1a09c484c5766e897b8791c7cfe.zip
u-boot-imx-cd309029f2b8a1a09c484c5766e897b8791c7cfe.tar.gz
u-boot-imx-cd309029f2b8a1a09c484c5766e897b8791c7cfe.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-pxa
Diffstat (limited to 'cpu/pxa/interrupts.c')
-rw-r--r--cpu/pxa/interrupts.c46
1 files changed, 24 insertions, 22 deletions
diff --git a/cpu/pxa/interrupts.c b/cpu/pxa/interrupts.c
index 40d8bf2..2bc5c50 100644
--- a/cpu/pxa/interrupts.c
+++ b/cpu/pxa/interrupts.c
@@ -28,6 +28,7 @@
#include <common.h>
#include <asm/arch/pxa-regs.h>
+#include <div64.h>
#ifdef CONFIG_USE_IRQ
#error: interrupts not implemented yet
@@ -41,6 +42,20 @@
#error "Timer frequency unknown - please config PXA CPU type"
#endif
+static inline unsigned long long tick_to_time(unsigned long long tick)
+{
+ tick *= CONFIG_SYS_HZ;
+ do_div(tick, TIMER_FREQ_HZ);
+ return tick;
+}
+
+static inline unsigned long long us_to_tick(unsigned long long us)
+{
+ us = us * TIMER_FREQ_HZ + 999999;
+ do_div(us, 1000000);
+ return us;
+}
+
int interrupt_init (void)
{
/* nothing happens here - we don't setup any IRQs */
@@ -75,33 +90,20 @@ void reset_timer_masked (void)
ulong get_timer_masked (void)
{
- unsigned long long ticks = get_ticks();
-
- return (((ticks / TIMER_FREQ_HZ) * 1000) +
- ((ticks % TIMER_FREQ_HZ) * 1000) / TIMER_FREQ_HZ);
+ return tick_to_time(get_ticks());
}
void udelay_masked (unsigned long usec)
{
+ unsigned long long tmp;
ulong tmo;
- ulong endtime;
- signed long diff;
-
- if (usec >= 1000) {
- tmo = usec / 1000;
- tmo *= TIMER_FREQ_HZ;
- tmo /= 1000;
- } else {
- tmo = usec * TIMER_FREQ_HZ;
- tmo /= (1000*1000);
- }
-
- endtime = get_ticks() + tmo;
-
- do {
- ulong now = get_ticks();
- diff = endtime - now;
- } while (diff >= 0);
+
+ tmo = us_to_tick(usec);
+ tmp = get_ticks() + tmo; /* get current timestamp */
+
+ while (get_ticks() < tmp) /* loop till event */
+ /*NOP*/;
+
}
/*