diff options
| author | Antoine Ténart <antoine.tenart@free-electrons.com> | 2015-08-18 11:59:10 +0300 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-10-28 05:14:01 +0300 |
| commit | fd498c50c30ea0f951fac76bc733eae599efdcb9 (patch) | |
| tree | 1beb9dc564756fff7e80bfe3b4ff9ab7d4c177fc /drivers/mtd | |
| parent | 0dfca2dcd62e3ff9d6d05a927af066c51ce46f53 (diff) | |
| download | linux-fd498c50c30ea0f951fac76bc733eae599efdcb9.tar.xz | |
mtd: pxa3xx_nand: add a default chunk size
[ Upstream commit bc3e00f04cc1fe033a289c2fc2e5c73c0168d360 ]
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@free-electrons.com>
Acked-by: Robert Jarzmik <robert.jarzmik@free>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/pxa3xx_nand.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c index bc677362bc73..eac876732f97 100644 --- a/drivers/mtd/nand/pxa3xx_nand.c +++ b/drivers/mtd/nand/pxa3xx_nand.c @@ -1465,6 +1465,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", |