---

yaml
---
r: 332773
b: refs/heads/master
c: 9c95f11
h: refs/heads/master
i:
  332771: 8021bcc
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 995fbbf563fcec058a1135bdd112ac969c817e65
+refs/heads/master: 9c95f11b9e743aa6134134a6dcf866a9d5661972

trunk/drivers/mtd/nand/gpmi-nand/gpmi-lib.c

@@ -914,6 +914,9 @@ static int enable_edo_mode(struct gpmi_nand_data *this, int mode)
 	rate = (mode == 5) ? 100000000 : 80000000;
 	clk_set_rate(r->clock[0], rate);
 
+	/* Let the gpmi_begin() re-compute the timing again. */
+	this->flags &= ~GPMI_TIMING_INIT_OK;
+
 	this->flags |= GPMI_ASYNC_EDO_ENABLED;
 	this->timing_mode = mode;
 	dev_info(this->dev, "enable the asynchronous EDO mode %d\n", mode);
@@ -964,6 +967,11 @@ void gpmi_begin(struct gpmi_nand_data *this)
 		goto err_out;
 	}
 
+	/* Only initialize the timing once */
+	if (this->flags & GPMI_TIMING_INIT_OK)
+		return;
+	this->flags |= GPMI_TIMING_INIT_OK;
+
 	if (this->flags & GPMI_ASYNC_EDO_ENABLED)
 		gpmi_compute_edo_timing(this, &hw);
 	else

trunk/drivers/mtd/nand/gpmi-nand/gpmi-nand.h

@@ -124,6 +124,7 @@ struct nand_timing {
 struct gpmi_nand_data {
 	/* flags */
 #define GPMI_ASYNC_EDO_ENABLED	(1 << 0)
+#define GPMI_TIMING_INIT_OK	(1 << 1)
 	int			flags;
 
 	/* System Interface */