From: Antoine Ténart Date: Tue, 18 Aug 2015 08:59:10 +0000 (+0200) Subject: mtd: pxa3xx_nand: add a default chunk size X-Git-Tag: firefly_0821_release~176^2~766^2~185 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bc3e00f04cc1fe033a289c2fc2e5c73c0168d360;p=firefly-linux-kernel-4.4.55.git 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 Acked-by: Robert Jarzmik Signed-off-by: Brian Norris --- diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c index 9d973cd5bcab..baf3246edeef 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",