Patchwork [U-Boot] OMAP3: Use sdelay from arch/arm/cpu/armv7/syslib.c instead of cloning that.

login
register
mail settings
Submitter Alexander Holler
Date Dec. 18, 2010, 12:24 p.m.
Message ID <1292675060-3971-1-git-send-email-holler@ahsoftware.de>
Download mbox | patch
Permalink /patch/76068/
State Accepted
Delegated to: Anatolij Gustschin
Headers show

Comments

Alexander Holler - Dec. 18, 2010, 12:24 p.m.
There is no need to have such a function twice.

Signed-off-by: Alexander Holler <holler@ahsoftware.de>
---
 arch/arm/cpu/armv7/omap3/board.c |   12 +-----------
 1 files changed, 1 insertions(+), 11 deletions(-)
Dirk Behme - Dec. 19, 2010, 7:54 a.m.
On 18.12.2010 13:24, Alexander Holler wrote:
> There is no need to have such a function twice.
>
> Signed-off-by: Alexander Holler<holler@ahsoftware.de>
> ---
>   arch/arm/cpu/armv7/omap3/board.c |   12 +-----------
>   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 6c2a132..0e62626 100644
> --- a/arch/arm/cpu/armv7/omap3/board.c
> +++ b/arch/arm/cpu/armv7/omap3/board.c
> @@ -41,16 +41,6 @@
>   extern omap3_sysinfo sysinfo;
>
>   /******************************************************************************
> - * 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)
> @@ -189,7 +179,7 @@ void s_init(void)
>   		setup_auxcr();
>
>   	set_muxconf_regs();
> -	delay(100);
> +	sdelay(100);
>
>   	prcm_init();
>

Looking at the implementation of sdelay(), yes, it seems it's just an 
identical copy of delay(). So:

Acked-by: Dirk Behme <dirk.behme@googlemail.com>

Thanks

Dirk
Anatolij Gustschin - Nov. 18, 2011, 11:16 p.m.
On Sat, 18 Dec 2010 13:24:20 +0100
Alexander Holler <holler@ahsoftware.de> wrote:

> There is no need to have such a function twice.
> 
> Signed-off-by: Alexander Holler <holler@ahsoftware.de>
> ---
>  arch/arm/cpu/armv7/omap3/board.c |   12 +-----------
>  1 files changed, 1 insertions(+), 11 deletions(-)

Applied rebased version to u-boot-staging agust@denx.de

Thanks,
Anatolij

Patch

diff --git a/arch/arm/cpu/armv7/omap3/board.c b/arch/arm/cpu/armv7/omap3/board.c
index 6c2a132..0e62626 100644
--- a/arch/arm/cpu/armv7/omap3/board.c
+++ b/arch/arm/cpu/armv7/omap3/board.c
@@ -41,16 +41,6 @@ 
 extern omap3_sysinfo sysinfo;
 
 /******************************************************************************
- * 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)
@@ -189,7 +179,7 @@  void s_init(void)
 		setup_auxcr();
 
 	set_muxconf_regs();
-	delay(100);
+	sdelay(100);
 
 	prcm_init();