diff mbox

mtd: atmel_nand: add pmecc support for 512, 1k, 4k, 8k page size

Message ID 1406021058-5490-1-git-send-email-josh.wu@atmel.com
State Accepted
Commit a35571058ec8e7c82dceea90cdecead51674f963
Headers show

Commit Message

Josh Wu July 22, 2014, 9:24 a.m. UTC 
PMECC can support 512, 1k, 2k, 4k, 8k page size.
The driver currently only support 2k page size nand flash. So this patch
add support to 512, 1k, 4k and 8k page size nand flash.

Signed-off-by: Josh Wu <josh.wu@atmel.com>
---
 drivers/mtd/nand/atmel_nand.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

Comments

Brian Norris Aug. 4, 2014, 9:18 p.m. UTC | #1 
On Tue, Jul 22, 2014 at 05:24:18PM +0800, Josh Wu wrote:
> PMECC can support 512, 1k, 2k, 4k, 8k page size.
> The driver currently only support 2k page size nand flash. So this patch
> add support to 512, 1k, 4k and 8k page size nand flash.
> 
> Signed-off-by: Josh Wu <josh.wu@atmel.com>

Queued to l2-mtd.git/next. Thanks!

Brian
diff mbox

Patch

diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c
index 371afdd..33826a0 100644
--- a/drivers/mtd/nand/atmel_nand.c
+++ b/drivers/mtd/nand/atmel_nand.c
@@ -1174,7 +1174,17 @@  static int atmel_pmecc_nand_init_params(struct platform_device *pdev,
 
 	/* set ECC page size and oob layout */
 	switch (mtd->writesize) {
+	case 512:
+	case 1024:
 	case 2048:
+	case 4096:
+	case 8192:
+		if (sector_size > mtd->writesize) {
+			dev_err(host->dev, "pmecc sector size is bigger than the page size!\n");
+			err_no = -EINVAL;
+			goto err;
+		}
+
 		host->pmecc_degree = (sector_size == 512) ?
 			PMECC_GF_DIMENSION_13 : PMECC_GF_DIMENSION_14;
 		host->pmecc_cw_len = (1 << host->pmecc_degree) - 1;
@@ -1201,13 +1211,9 @@  static int atmel_pmecc_nand_init_params(struct platform_device *pdev,
 
 		nand_chip->ecc.layout = &atmel_pmecc_oobinfo;
 		break;
-	case 512:
-	case 1024:
-	case 4096:
-		/* TODO */
+	default:
 		dev_warn(host->dev,
 			"Unsupported page size for PMECC, use Software ECC\n");
-	default:
 		/* page size not handled by HW ECC */
 		/* switching back to soft ECC */
 		nand_chip->ecc.mode = NAND_ECC_SOFT;