X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=arch%2Farm%2Fmach-omap2%2Fgpmc.c;h=82979d2b4307ac18fbfedaa7631c8077b674d7f6;hb=48ef82436e24768cc7b94c71f2b40b78eaf8d928;hp=130034bf01d5f880541976cf3210de7e74293ce1;hpb=96fd2d57b8252e16dfacf8941f7a74a6119197f5;p=pandora-kernel.git

diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
index 130034bf01d5..82979d2b4307 100644
--- a/arch/arm/mach-omap2/gpmc.c
+++ b/arch/arm/mach-omap2/gpmc.c
@@ -480,6 +480,11 @@ int gpmc_read_status(int cmd)
 		status = regval & GPMC_STATUS_BUFF_EMPTY;
 		break;
 
+	case GPMC_STATUS_WAIT:
+		regval = gpmc_read_reg(GPMC_STATUS);
+		status = regval & 0x100;
+		break;
+
 	default:
 		printk(KERN_ERR "gpmc_read_status: Not supported\n");
 	}
@@ -528,7 +533,13 @@ int gpmc_cs_configure(int cs, int cmd, int wval)
 
 	case GPMC_CONFIG_DEV_SIZE:
 		regval  = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG1);
+
+		/* clear 2 target bits */
+		regval &= ~GPMC_CONFIG1_DEVICESIZE(3);
+
+		/* set the proper value */
 		regval |= GPMC_CONFIG1_DEVICESIZE(wval);
+
 		gpmc_cs_write_reg(cs, GPMC_CS_CONFIG1, regval);
 		break;