[U-Boot] [PATCH v2 1/4] mx5: cosmetic: Clean up lowlevel_init

[Stefano Babic]

On 14/08/2012 17:18, Benoît Thébaudeau wrote:
> Coding style cleanup:
>  - Remove useless parentheses.
>  - Use tabs for indentations and alignments. 
> 
> Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau at advansee.com>
> Cc: Stefano Babic <sbabic at denx.de>
> ---
> Changes for v2:
>  - Make patch description more detailed.
> 
>  .../arch/arm/cpu/armv7/mx5/lowlevel_init.S         |   46 ++++++++++----------
>  1 file changed, 23 insertions(+), 23 deletions(-)
> 
> diff --git u-boot-4d3c95f.orig/arch/arm/cpu/armv7/mx5/lowlevel_init.S u-boot-4d3c95f/arch/arm/cpu/armv7/mx5/lowlevel_init.S
> index 683a7b5..a40b84f 100644
> --- u-boot-4d3c95f.orig/arch/arm/cpu/armv7/mx5/lowlevel_init.S
> +++ u-boot-4d3c95f/arch/arm/cpu/armv7/mx5/lowlevel_init.S
> @@ -36,9 +36,9 @@
>  	/* reconfigure L2 cache aux control reg */
>  	mov r0, #0xC0			/* tag RAM */
>  	add r0, r0, #0x4		/* data RAM */
> -	orr r0, r0, #(1 << 24)		/* disable write allocate delay */
> -	orr r0, r0, #(1 << 23)		/* disable write allocate combine */
> -	orr r0, r0, #(1 << 22)		/* disable write allocate */
> +	orr r0, r0, #1 << 24		/* disable write allocate delay */
> +	orr r0, r0, #1 << 23		/* disable write allocate combine */
> +	orr r0, r0, #1 << 22		/* disable write allocate */
>  
>  #if defined(CONFIG_MX51)
>  	ldr r1, =0x0
> @@ -46,7 +46,7 @@
>  	cmp r3, #0x10
>  
>  	/* disable write combine for TO 2 and lower revs */
> -	orrls r0, r0, #(1 << 25)
> +	orrls r0, r0, #1 << 25
>  #endif
>  
>  	mcr 15, 1, r0, c9, c0, 2
> @@ -247,9 +247,9 @@
>  	movhi r1, #0
>  #else
>  	mov r1, #0
> -
>  #endif
>  	str r1, [r0, #CLKCTL_CACRR]
> +
>  	/* Switch ARM back to PLL 1 */
>  	mov r1, #0
>  	str r1, [r0, #CLKCTL_CCSR]
> @@ -288,9 +288,9 @@
>  	/* Switch peripheral to PLL2 */
>  	ldr r0, =CCM_BASE_ADDR
>  	ldr r1, =0x00808145
> -	orr r1, r1, #(2 << 10)
> -	orr r1, r1, #(0 << 16)
> -	orr r1, r1, #(1 << 19)
> +	orr r1, r1, #2 << 10
> +	orr r1, r1, #0 << 16
> +	orr r1, r1, #1 << 19
>  	str r1, [r0, #CLKCTL_CBCDR]
>  
>  	ldr r1, =0x00016154
> @@ -331,10 +331,10 @@ ENTRY(lowlevel_init)
>  #if defined(CONFIG_MX51)
>  	ldr r0, =GPIO1_BASE_ADDR
>  	ldr r1, [r0, #0x0]
> -	orr r1, r1, #(1 << 23)
> +	orr r1, r1, #1 << 23
>  	str r1, [r0, #0x0]
>  	ldr r1, [r0, #0x4]
> -	orr r1, r1, #(1 << 23)
> +	orr r1, r1, #1 << 23
>  	str r1, [r0, #0x4]
>  #endif
>  
> @@ -351,16 +351,16 @@ ENTRY(lowlevel_init)
>  ENDPROC(lowlevel_init)
>  
>  /* Board level setting value */
> -W_DP_OP_864:              .word DP_OP_864
> -W_DP_MFD_864:             .word DP_MFD_864
> -W_DP_MFN_864:             .word DP_MFN_864
> -W_DP_MFN_800_DIT:         .word DP_MFN_800_DIT
> -W_DP_OP_800:              .word DP_OP_800
> -W_DP_MFD_800:             .word DP_MFD_800
> -W_DP_MFN_800:             .word DP_MFN_800
> -W_DP_OP_665:              .word DP_OP_665
> -W_DP_MFD_665:             .word DP_MFD_665
> -W_DP_MFN_665:             .word DP_MFN_665
> -W_DP_OP_216:              .word DP_OP_216
> -W_DP_MFD_216:             .word DP_MFD_216
> -W_DP_MFN_216:             .word DP_MFN_216
> +W_DP_OP_864:		.word DP_OP_864
> +W_DP_MFD_864:		.word DP_MFD_864
> +W_DP_MFN_864:		.word DP_MFN_864
> +W_DP_MFN_800_DIT:	.word DP_MFN_800_DIT
> +W_DP_OP_800:		.word DP_OP_800
> +W_DP_MFD_800:		.word DP_MFD_800
> +W_DP_MFN_800:		.word DP_MFN_800
> +W_DP_OP_665:		.word DP_OP_665
> +W_DP_MFD_665:		.word DP_MFD_665
> +W_DP_MFN_665:		.word DP_MFN_665
> +W_DP_OP_216:		.word DP_OP_216
> +W_DP_MFD_216:		.word DP_MFD_216
> +W_DP_MFN_216:		.word DP_MFN_216
> 

Applied to u-boot-imx, thanks.

Best regards,
Stefano Babic
-- 
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================