ARM: 6174/1: ep93xx: clear devcfg bits before setting them
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> Acked-by: Ryan Mallon <ryan@bluewatersys.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
parent
16bcf78f8c
commit
a0fb007bf0
@ -216,8 +216,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);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user