summaryrefslogtreecommitdiffstats
path: root/arch/arm/cpu/armv7/omap3
diff options
context:
space:
mode:
authorAlexander Holler <holler@ahsoftware.de>2010-12-18 13:24:20 +0100
committerWolfgang Denk <wd@denx.de>2011-11-29 15:43:38 +0100
commit86623add12c538aa767b83a130eeddf24c853609 (patch)
tree6272e893b51afe7149c7e61c73c7bde142ca8f0b /arch/arm/cpu/armv7/omap3
parentc9e798d35a2995931418d204141d13c019306d8c (diff)
downloadtalos-obmc-uboot-86623add12c538aa767b83a130eeddf24c853609.tar.gz
talos-obmc-uboot-86623add12c538aa767b83a130eeddf24c853609.zip
OMAP3: Use sdelay from arch/arm/cpu/armv7/syslib.c instead of cloning that.
There is no need to have such a function twice. Signed-off-by: Alexander Holler <holler@ahsoftware.de> Acked-by: Dirk Behme <dirk.behme@googlemail.com> Signed-off-by: Anatolij Gustschin <agust@denx.de>
Diffstat (limited to 'arch/arm/cpu/armv7/omap3')
-rw-r--r--arch/arm/cpu/armv7/omap3/board.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/arm/cpu/armv7/omap3/board.c b/arch/arm/cpu/armv7/omap3/board.c
index a9fdb4f8ed..cdf452dfbc 100644
--- a/arch/arm/cpu/armv7/omap3/board.c
+++ b/arch/arm/cpu/armv7/omap3/board.c
@@ -93,16 +93,6 @@ u32 omap_boot_device(void)
/******************************************************************************
- * Routine: delay
- * Description: spinning delay to use before udelay works
- *****************************************************************************/
-static inline void delay(unsigned long loops)
-{
- __asm__ volatile ("1:\n" "subs %0, %1, #1\n"
- "bne 1b":"=r" (loops):"0"(loops));
-}
-
-/******************************************************************************
* Routine: secure_unlock
* Description: Setup security registers for access
* (GP Device only)
@@ -227,7 +217,7 @@ void s_init(void)
#endif
set_muxconf_regs();
- delay(100);
+ sdelay(100);
prcm_init();
OpenPOWER on IntegriCloud