[U-Boot,09/11] arm: ks8695/cm4xxx: don't reconfigure switch

Message ID	1349438998-10954-10-git-send-email-yann.vernier@orsoc.se
State	Changes Requested
Delegated to:	Albert ARIBAUD
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> From: Yann Vernier <yann.vernier@orsoc.se> To: u-boot@lists.denx.de Date: Fri, 5 Oct 2012 14:09:56 +0200 Message-Id: <1349438998-10954-10-git-send-email-yann.vernier@orsoc.se> In-Reply-To: <1349438998-10954-1-git-send-email-yann.vernier@orsoc.se> References: <1349438998-10954-1-git-send-email-yann.vernier@orsoc.se> In-Reply-To: <20121004111506.1777a119@lilith> References: <20121004111506.1777a119@lilith> Subject: [U-Boot] [PATCH 09/11] arm: ks8695/cm4xxx: don't reconfigure switch Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de

Message ID

1349438998-10954-10-git-send-email-yann.vernier@orsoc.se

State

Changes Requested

Delegated to:

Albert ARIBAUD

Headers

From: Yann Vernier <yann.vernier@orsoc.se>
To: u-boot@lists.denx.de
Date: Fri,  5 Oct 2012 14:09:56 +0200
Message-Id: <1349438998-10954-10-git-send-email-yann.vernier@orsoc.se>
In-Reply-To: <1349438998-10954-1-git-send-email-yann.vernier@orsoc.se>
References: <1349438998-10954-1-git-send-email-yann.vernier@orsoc.se>
In-Reply-To: <20121004111506.1777a119@lilith>
References: <20121004111506.1777a119@lilith>
Subject: [U-Boot] [PATCH 09/11] arm: ks8695/cm4xxx: don't reconfigure switch
Precedence: list
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: u-boot-bounces@lists.denx.de
Errors-To: u-boot-bounces@lists.denx.de

A small bug caused code to set up LEDs to instead disable lots of functionality in the Ethernet switch, including bounds checks. --- arch/arm/cpu/arm920t/ks8695/lowlevel_init.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Albert ARIBAUD Oct. 18, 2012, 7:13 p.m. UTC | #1

Hi Yann,

On Fri,  5 Oct 2012 14:09:56 +0200, Yann Vernier
<yann.vernier@orsoc.se> wrote:

> A small bug caused code to set up LEDs to instead disable lots
> of functionality in the Ethernet switch, including bounds checks.
> ---
>  arch/arm/cpu/arm920t/ks8695/lowlevel_init.S |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/cpu/arm920t/ks8695/lowlevel_init.S b/arch/arm/cpu/arm920t/ks8695/lowlevel_init.S
> index bec9738..31b028b 100644
> --- a/arch/arm/cpu/arm920t/ks8695/lowlevel_init.S
> +++ b/arch/arm/cpu/arm920t/ks8695/lowlevel_init.S
> @@ -205,7 +205,7 @@ highflash:
>  
>  	ldr	r1, =(KS8695_IO_BASE+KS8695_SWITCH_CTRL0)
>  	ldr	r2, [r1]		/* Get switch ctrl0 register       */
> -	and	r2, r2, #0x0fc00000	/* Mask out LED control bits       */
> +	bic	r2, r2, #0x0fc00000	/* Mask out LED control bits       */
>  	orr	r2, r2, #0x01800000	/* Set Link/activity/speed actions */
>  	str	r2, [r1]
>  

Can you turn the magic numbers here into more explicit symbolic values?

Amicalement,

diff --git a/arch/arm/cpu/arm920t/ks8695/lowlevel_init.S b/arch/arm/cpu/arm920t/ks8695/lowlevel_init.S
index bec9738..31b028b 100644
--- a/arch/arm/cpu/arm920t/ks8695/lowlevel_init.S
+++ b/arch/arm/cpu/arm920t/ks8695/lowlevel_init.S
@@ -205,7 +205,7 @@  highflash:
 
 	ldr	r1, =(KS8695_IO_BASE+KS8695_SWITCH_CTRL0)
 	ldr	r2, [r1]		/* Get switch ctrl0 register       */
-	and	r2, r2, #0x0fc00000	/* Mask out LED control bits       */
+	bic	r2, r2, #0x0fc00000	/* Mask out LED control bits       */
 	orr	r2, r2, #0x01800000	/* Set Link/activity/speed actions */
 	str	r2, [r1]

[U-Boot,09/11] arm: ks8695/cm4xxx: don't reconfigure switch

Commit Message

Comments

Patch