mtd: pxa3xx_nand: add a default chunk size

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=bc3e00f04cc1fe033a289c2fc2e5c73c0168d360
Commit:     bc3e00f04cc1fe033a289c2fc2e5c73c0168d360
Parent:     0f0aca5d50ced8d8c18c7982a6b6332182b70e33
Author:     Antoine Ténart <antoine.tenart at free-electrons.com>
AuthorDate: Tue Aug 18 10:59:10 2015 +0200
Committer:  Brian Norris <computersforpeace at gmail.com>
CommitDate: Tue Aug 18 18:03:54 2015 -0700

    mtd: pxa3xx_nand: add a default chunk size
    
    When keeping the configuration set by the bootloader (by using
    the marvell,nand-keep-config property), the pxa3xx_nand_detect_config()
    function is called and set the chunk size to 512 as a default value if
    NDCR_PAGE_SZ is not set.
    
    In the other case, when not keeping the bootloader configuration, no
    chunk size is set. Fix this by adding a default chunk size of 512.
    
    Fixes: 70ed85232a93 ("mtd: nand: pxa3xx: Introduce multiple page I/O
    support")
    
    Signed-off-by: Antoine Tenart <antoine.tenart at free-electrons.com>
    Acked-by: Robert Jarzmik <robert.jarzmik at free>
    Signed-off-by: Brian Norris <computersforpeace at gmail.com>
---
 drivers/mtd/nand/pxa3xx_nand.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
index 9d973cd..baf3246 100644
--- a/drivers/mtd/nand/pxa3xx_nand.c
+++ b/drivers/mtd/nand/pxa3xx_nand.c
@@ -1476,6 +1476,9 @@ static int pxa3xx_nand_scan(struct mtd_info *mtd)
 	if (pdata->keep_config && !pxa3xx_nand_detect_config(info))
 		goto KEEP_CONFIG;
 
+	/* Set a default chunk size */
+	info->chunk_size = 512;
+
 	ret = pxa3xx_nand_sensing(info);
 	if (ret) {
 		dev_info(&info->pdev->dev, "There is no chip on cs %d!\n",