On 02/06/2013 08:15 AM, Mark Jackson wrote: > When setting the GPMC device type, make sure any previous > bits are cleared down, before applying the new setting. > > Signed-off-by: Mark Jackson <mpfj@xxxxxxxxxxxxx> > --- > arch/arm/mach-omap2/gpmc.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c > index 1adb2d4..026e786 100644 > --- a/arch/arm/mach-omap2/gpmc.c > +++ b/arch/arm/mach-omap2/gpmc.c > @@ -613,6 +613,10 @@ int gpmc_cs_configure(int cs, int cmd, int wval) > > case GPMC_CONFIG_DEV_TYPE: > regval = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG1); > + /* clear 3 target bits */ > + regval &= ~(GPMC_CONFIG1_DEVICETYPE(3) | > + GPMC_CONFIG1_MUXADDDATA); MUXADDDATA is actually a 2-bit field on current devices (OMAP4+ and AM335x). For OMAP2/3 devices it was only a one bit field. So it may be worth clearing both bits for all devices. For OMAP2 devices bit 8 is reserved but the TRM says to writes a 0, so clearing bit 8 on OMAP2/3 devices should not be a problem. In fact bit 8 should read as 0 on OMAP2/3. > + /* set the proper value */ > regval |= GPMC_CONFIG1_DEVICETYPE(wval); > if (wval == GPMC_DEVICETYPE_NOR) > regval |= GPMC_CONFIG1_MUXADDDATA; > Otherwise ... Acked-by: Jon Hunter <jon-hunter@xxxxxx> Cheers Jon -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
