[PATCH] ep93xx: clear devcfg bits before setting them

[PATCH] ep93xx: clear devcfg bits before setting them

[H Hartley Sweeten]

The ep93xx core helper function ep93xx_devcfg_set_clear should mask the
clear_bits before setting the new set_bits in case the clear_bits are a
mask value that also includes the set_bits.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ryan Mallon <ryan@bluewatersys.com>

---

diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c
index 9092677..92f2ebb 100644
--- a/arch/arm/mach-ep93xx/core.c
+++ b/arch/arm/mach-ep93xx/core.c
@@ -215,8 +215,8 @@ void ep93xx_devcfg_set_clear(unsigned int set_bits, unsigned int clear_bits)
 	spin_lock_irqsave(&syscon_swlock, flags);
 
 	val = __raw_readl(EP93XX_SYSCON_DEVCFG);
-	val |= set_bits;
 	val &= ~clear_bits;
+	val |= set_bits;
 	__raw_writel(0xaa, EP93XX_SYSCON_SWLOCK);
 	__raw_writel(val, EP93XX_SYSCON_DEVCFG);
 

[PATCH] ep93xx: clear devcfg bits before setting them

[Ryan Mallon]

H Hartley Sweeten wrote:
> The ep93xx core helper function ep93xx_devcfg_set_clear should mask the
> clear_bits before setting the new set_bits in case the clear_bits are a
> mask value that also includes the set_bits.
> 
> Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
> Cc: Ryan Mallon <ryan@bluewatersys.com>

Acked-by: Ryan Mallon <ryan@bluewatersys.com>

> ---
> 
> diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c
> index 9092677..92f2ebb 100644
> --- a/arch/arm/mach-ep93xx/core.c
> +++ b/arch/arm/mach-ep93xx/core.c
> @@ -215,8 +215,8 @@ void ep93xx_devcfg_set_clear(unsigned int set_bits, unsigned int clear_bits)
>  	spin_lock_irqsave(&syscon_swlock, flags);
>  
>  	val = __raw_readl(EP93XX_SYSCON_DEVCFG);
> -	val |= set_bits;
>  	val &= ~clear_bits;
> +	val |= set_bits;
>  	__raw_writel(0xaa, EP93XX_SYSCON_SWLOCK);
>  	__raw_writel(val, EP93XX_SYSCON_DEVCFG);
>  


-- 
Bluewater Systems Ltd - ARM Technology Solution Centre

Ryan Mallon         		5 Amuri Park, 404 Barbadoes St
ryan at bluewatersys.com         	PO Box 13 889, Christchurch 8013
http://www.bluewatersys.com	New Zealand
Phone: +64 3 3779127		Freecall: Australia 1800 148 751
Fax:   +64 3 3779135			  USA 1800 261 2934