c9ae111a20
This is a backport of the patches accepted to the Linux mainline related to mvebu SoC (Armada XP and Armada 370) between Linux v3.12, and Linux v3.13. This work mainly covers: * Finishes work for sharing the pxa nand driver(drivers/mtd/nand/pxa3xx_nand.c) between the PXA family, and the Armada family. * timer initialization update, and access function for the Armada family. * Generic IRQ handling backporting. * Some bug fixes. Signed-off-by: Seif Mazareeb <seif.mazareeb@gmail.com> CC: Luka Perkov <luka@openwrt.org> SVN-Revision: 39566
69 lines
2.3 KiB
Diff
69 lines
2.3 KiB
Diff
From 1c0aed9b4cfb7bb891aab07a429436d017ac4d7c Mon Sep 17 00:00:00 2001
|
|
From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
|
|
Date: Thu, 14 Nov 2013 18:25:34 -0300
|
|
Subject: [PATCH 148/203] mtd: nand: pxa3xx: Move the data buffer clean to
|
|
prepare_start_command()
|
|
|
|
To allow future support of multiple page reading/writing, move the data
|
|
buffer clean out of prepare_set_command().
|
|
|
|
This is done to prevent the data buffer from being cleaned on every command
|
|
preparation, when a multiple command sequence is implemented to read/write
|
|
pages larger than the FIFO size (2 KiB).
|
|
|
|
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
|
|
Tested-by: Daniel Mack <zonque@gmail.com>
|
|
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
|
|
---
|
|
drivers/mtd/nand/pxa3xx_nand.c | 21 ++++++++++++++++-----
|
|
1 file changed, 16 insertions(+), 5 deletions(-)
|
|
|
|
--- a/drivers/mtd/nand/pxa3xx_nand.c
|
|
+++ b/drivers/mtd/nand/pxa3xx_nand.c
|
|
@@ -609,6 +609,9 @@ static void set_command_address(struct p
|
|
|
|
static void prepare_start_command(struct pxa3xx_nand_info *info, int command)
|
|
{
|
|
+ struct pxa3xx_nand_host *host = info->host[info->cs];
|
|
+ struct mtd_info *mtd = host->mtd;
|
|
+
|
|
/* reset data and oob column point to handle data */
|
|
info->buf_start = 0;
|
|
info->buf_count = 0;
|
|
@@ -633,6 +636,19 @@ static void prepare_start_command(struct
|
|
info->ndcb2 = 0;
|
|
break;
|
|
}
|
|
+
|
|
+ /*
|
|
+ * If we are about to issue a read command, or about to set
|
|
+ * the write address, then clean the data buffer.
|
|
+ */
|
|
+ if (command == NAND_CMD_READ0 ||
|
|
+ command == NAND_CMD_READOOB ||
|
|
+ command == NAND_CMD_SEQIN) {
|
|
+
|
|
+ info->buf_count = mtd->writesize + mtd->oobsize;
|
|
+ memset(info->data_buff, 0xFF, info->buf_count);
|
|
+ }
|
|
+
|
|
}
|
|
|
|
static int prepare_set_command(struct pxa3xx_nand_info *info, int command,
|
|
@@ -674,16 +690,11 @@ static int prepare_set_command(struct px
|
|
info->ndcb0 |= NDCB0_DBC | (NAND_CMD_READSTART << 8);
|
|
|
|
set_command_address(info, mtd->writesize, column, page_addr);
|
|
- info->buf_count = mtd->writesize + mtd->oobsize;
|
|
- memset(info->data_buff, 0xFF, info->buf_count);
|
|
break;
|
|
|
|
case NAND_CMD_SEQIN:
|
|
|
|
set_command_address(info, mtd->writesize, column, page_addr);
|
|
- info->buf_count = mtd->writesize + mtd->oobsize;
|
|
- memset(info->data_buff, 0xFF, info->buf_count);
|
|
-
|
|
break;
|
|
|
|
case NAND_CMD_PAGEPROG:
|