2015-08-18 08:59:15

by Antoine Tenart

Subject: [PATCH] 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 <[email protected]>
Acked-by: Robert Jarzmik <robert.jarzmik@free>
---
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 1259cc558ce9..5465fa439c9e 100644
--- a/drivers/mtd/nand/pxa3xx_nand.c
+++ b/drivers/mtd/nand/pxa3xx_nand.c
@@ -1473,6 +1473,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",
--
2.5.0

2015-08-19 01:09:39

by Brian Norris

Subject: Re: [PATCH] mtd: pxa3xx_nand: add a default chunk size

On Tue, Aug 18, 2015 at 10:59:10AM +0200, Antoine Tenart wrote:
> 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 <[email protected]>
> Acked-by: Robert Jarzmik <robert.jarzmik@free>

Applied to l2-mtd.git