mxc_nand: simplify command processing

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

1 files changed, 35 insertions, 49 deletions

diff --git a/drivers/nand/nand_imx.c b/drivers/nand/nand_imx.c
index 6da3b738d5..8a2e58eb8f 100644
--- a/drivers/nand/nand_imx.c
+++ b/drivers/nand/nand_imx.c
@@ -263,7 +263,7 @@ static void __nand_boot_init send_page(struct imx_nand_host *host, u8 buf_id,
  * This function requests the NANDFC to perform a read of the
  * NAND device ID.
  */
-static void noinline send_read_id(struct imx_nand_host *host)
+static void send_read_id(struct imx_nand_host *host)
 {
 	struct nand_chip *this = &host->nand;
 	u16 tmp;
@@ -633,17 +633,37 @@ static void imx_nand_command(struct mtd_info *mtd, unsigned command,
 	case NAND_CMD_STATUS:
 		host->buf_start = 0;
 		host->status_request = 1;
+		send_cmd(host, command);
+		mxc_do_addr_cycle(mtd, column, page_addr);
 		break;
 
 	case NAND_CMD_READ0:
-		host->buf_start = column;
-		break;
-
 	case NAND_CMD_READOOB:
-		host->buf_start = column + mtd->writesize;
+		if (command == NAND_CMD_READ0)
+			host->buf_start = column;
+		else
+			host->buf_start = column + mtd->writesize;
+
 		if (host->pagesize_2k)
 			/* only READ0 is valid */
 			command = NAND_CMD_READ0;
+
+		send_cmd(host, command);
+		mxc_do_addr_cycle(mtd, column, page_addr);
+
+		if (host->pagesize_2k) {
+			/* send read confirm command */
+			send_cmd(host, NAND_CMD_READSTART);
+			/* read for each AREA */
+			send_page(host, 0, NFC_OUTPUT);
+			send_page(host, 1, NFC_OUTPUT);
+			send_page(host, 2, NFC_OUTPUT);
+			send_page(host, 3, NFC_OUTPUT);
+		} else
+			send_page(host, 0, NFC_OUTPUT);
+
+		memcpy32(host->data_buf, host->regs + MAIN_AREA0, mtd->writesize);
+		copy_spare(mtd, 1);
 		break;
 
 	case NAND_CMD_SEQIN:
@@ -672,6 +692,9 @@ static void imx_nand_command(struct mtd_info *mtd, unsigned command,
 			if (!host->pagesize_2k)
 				send_cmd(host, NAND_CMD_READ0);
 		}
+		send_cmd(host, command);
+		mxc_do_addr_cycle(mtd, column, page_addr);
+
 		break;
 
 	case NAND_CMD_PAGEPROG:
@@ -686,58 +709,21 @@ static void imx_nand_command(struct mtd_info *mtd, unsigned command,
 			send_page(host, 3, NFC_INPUT);
 		}
 
-		break;
-
-	case NAND_CMD_ERASE1:
-		break;
-	}
-
-	/*
-	 * Write out the command to the device.
-	 */
-	send_cmd(host, command);
-
-	mxc_do_addr_cycle(mtd, column, page_addr);
-
-	/*
-	 * Command post-processing step
-	 */
-	switch (command) {
-
-	case NAND_CMD_RESET:
-		break;
-
-	case NAND_CMD_READOOB:
-	case NAND_CMD_READ0:
-		if (host->pagesize_2k) {
-			/* send read confirm command */
-			send_cmd(host, NAND_CMD_READSTART);
-			/* read for each AREA */
-			send_page(host, 0, NFC_OUTPUT);
-			send_page(host, 1, NFC_OUTPUT);
-			send_page(host, 2, NFC_OUTPUT);
-			send_page(host, 3, NFC_OUTPUT);
-		} else {
-			send_page(host, 0, NFC_OUTPUT);
-		}
-
-		memcpy32(host->data_buf, host->regs + MAIN_AREA0, mtd->writesize);
-		copy_spare(mtd, 1);
-
+		send_cmd(host, command);
+		mxc_do_addr_cycle(mtd, column, page_addr);
 		break;
 
 	case NAND_CMD_READID:
+		send_cmd(host, command);
+		mxc_do_addr_cycle(mtd, column, page_addr);
 		host->buf_start = 0;
 		send_read_id(host);
 		break;
 
-	case NAND_CMD_PAGEPROG:
-		break;
-
-	case NAND_CMD_STATUS:
-		break;
-
+	case NAND_CMD_ERASE1:
 	case NAND_CMD_ERASE2:
+		send_cmd(host, command);
+		mxc_do_addr_cycle(mtd, column, page_addr);
 		break;
 	}
 }