From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sonic Zhang Date: Mon, 1 Jul 2013 11:17:41 +0800 Subject: [U-Boot] [PATCH] blackfin: gpio: Use proper mask for comparing function In-Reply-To: <1372401906.5103.4.camel@phoenix> References: <1372401906.5103.4.camel@phoenix> Message-ID: List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Acked-by: Sonic Zhang On Fri, Jun 28, 2013 at 2:45 PM, Axel Lin wrote: > The function return from P_FUNCT2MUX(per) takes 2 bits, however > for BF537_FAMILY with offset != 1 the function is 1 bit. > > Also has small refactor for better readability. > In portmux_setup(), it looks odd having "muxreg &= ~(3 << 1);" > while in current code we do muxreg |= (function << offset);. > > Signed-off-by: Axel Lin > --- > arch/blackfin/cpu/gpio.c | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) > > diff --git a/arch/blackfin/cpu/gpio.c b/arch/blackfin/cpu/gpio.c > index f74a0b7..c4cddaf 100644 > --- a/arch/blackfin/cpu/gpio.c > +++ b/arch/blackfin/cpu/gpio.c > @@ -247,7 +247,7 @@ static struct { > > static void portmux_setup(unsigned short per) > { > - u16 y, offset, muxreg; > + u16 y, offset, muxreg, mask; > u16 function = P_FUNCT2MUX(per); > > for (y = 0; y < ARRAY_SIZE(port_mux_lut); y++) { > @@ -258,12 +258,13 @@ static void portmux_setup(unsigned short per) > offset = port_mux_lut[y].offset; > muxreg = bfin_read_PORT_MUX(); > > - if (offset != 1) > - muxreg &= ~(1 << offset); > + if (offset == 1) > + mask = 3; > else > - muxreg &= ~(3 << 1); > + mask = 1; > > - muxreg |= (function << offset); > + muxreg &= ~(mask << offset); > + muxreg |= ((function & mask) << offset); > bfin_write_PORT_MUX(muxreg); > } > } > -- > 1.8.1.2 > > > > _______________________________________________ > U-Boot mailing list > U-Boot at lists.denx.de > http://lists.denx.de/mailman/listinfo/u-boot