From 779bf42c2a278b2a2f8a4d9e4869c237d0a8742a Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Fri, 29 Jun 2012 13:42:28 +0200 Subject: 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 Acked-by: Simon Glass --- arch/microblaze/cpu/timer.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'arch/microblaze/cpu/timer.c') diff --git a/arch/microblaze/cpu/timer.c b/arch/microblaze/cpu/timer.c index 1952804eaf..fdcd9e3bc6 100644 --- a/arch/microblaze/cpu/timer.c +++ b/arch/microblaze/cpu/timer.c @@ -41,6 +41,25 @@ ulong get_timer (ulong base) #endif #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); -- cgit v1.2.3 From 575a3d21f6d7cbb653e48a957d0b2db944f2b9b3 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Tue, 10 Jul 2012 10:31:31 +0200 Subject: microblaze: intc: Clear interrupt code Clear and prepare for device-tree driven configuration. Remove CONFIG_SYS_INTC_0 definition Use dynamic allocation instead of static. Signed-off-by: Michal Simek Acked-by: Simon Glass --- arch/microblaze/cpu/timer.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'arch/microblaze/cpu/timer.c') diff --git a/arch/microblaze/cpu/timer.c b/arch/microblaze/cpu/timer.c index fdcd9e3bc6..cc6b897fbb 100644 --- a/arch/microblaze/cpu/timer.c +++ b/arch/microblaze/cpu/timer.c @@ -40,7 +40,6 @@ ulong get_timer (ulong base) } #endif -#ifdef CONFIG_SYS_INTC_0 #ifdef CONFIG_SYS_TIMER_0 void __udelay(unsigned long usec) { @@ -80,7 +79,6 @@ int timer_init (void) return 0; } #endif -#endif /* * This function is derived from PowerPC code (read timebase as long long). -- cgit v1.2.3