When setting the GPMC device type, make sure any previous
bits are cleared down, before applying the new setting.

Signed-off-by: Mark Jackson <m...@newflow.co.uk>
---
 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);
+               /* set the proper value */
                regval |= GPMC_CONFIG1_DEVICETYPE(wval);
                if (wval == GPMC_DEVICETYPE_NOR)
                        regval |= GPMC_CONFIG1_MUXADDDATA;
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to