summaryrefslogtreecommitdiff
path: root/arch/microblaze/cpu/timer.c
diff options
context:
space:
mode:
authorMichal Simek <monstr@monstr.eu>2012-06-29 13:42:28 +0200
committerMichal Simek <monstr@monstr.eu>2012-07-10 11:54:06 +0200
commit779bf42c2a278b2a2f8a4d9e4869c237d0a8742a (patch)
treefb7a5c1b389ec413a7b0518f3fba26dee3849c99 /arch/microblaze/cpu/timer.c
parent36c7e6efb372848edbbcd16c196003d0d93c2e2a (diff)
downloadu-boot-imx-779bf42c2a278b2a2f8a4d9e4869c237d0a8742a.zip
u-boot-imx-779bf42c2a278b2a2f8a4d9e4869c237d0a8742a.tar.gz
u-boot-imx-779bf42c2a278b2a2f8a4d9e4869c237d0a8742a.tar.bz2
microblaze: Move __udelay implementation
Move __udelay to the timer code because of unification. And clean coding style because of checkpatch.pl. Signed-off-by: Michal Simek <monstr@monstr.eu> Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/microblaze/cpu/timer.c')
-rw-r--r--arch/microblaze/cpu/timer.c19
1 files changed, 19 insertions, 0 deletions
diff --git a/arch/microblaze/cpu/timer.c b/arch/microblaze/cpu/timer.c
index 1952804..fdcd9e3 100644
--- a/arch/microblaze/cpu/timer.c
+++ b/arch/microblaze/cpu/timer.c
@@ -42,6 +42,25 @@ ulong get_timer (ulong base)
#ifdef CONFIG_SYS_INTC_0
#ifdef CONFIG_SYS_TIMER_0
+void __udelay(unsigned long usec)
+{
+ int i;
+
+ i = get_timer(0);
+ while ((get_timer(0) - i) < (usec / 1000))
+ ;
+}
+#else
+void __udelay(unsigned long usec)
+{
+ unsigned int i;
+
+ for (i = 0; i < (usec * CONFIG_XILINX_CLOCK_FREQ / 10000000); i++)
+ ;
+}
+#endif
+
+#ifdef CONFIG_SYS_TIMER_0
microblaze_timer_t *tmr = (microblaze_timer_t *) (CONFIG_SYS_TIMER_0_ADDR);
void timer_isr (void *arg)