From mboxrd@z Thu Jan 1 00:00:00 1970 From: ryan@bluewatersys.com (Ryan Mallon) Date: Mon, 14 Jun 2010 10:46:21 +1200 Subject: [PATCH] ep93xx: clear devcfg bits before setting them In-Reply-To: <0D753D10438DA54287A00B027084269763711321BA@AUSP01VMBX24.collaborationhost.net> References: <0D753D10438DA54287A00B027084269763711321BA@AUSP01VMBX24.collaborationhost.net> Message-ID: <4C155FBD.4020106@bluewatersys.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 > Cc: Ryan Mallon Acked-by: Ryan Mallon > --- > > 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