| From bc3e00f04cc1fe033a289c2fc2e5c73c0168d360 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Antoine=20T=C3=A9nart?= <antoine.tenart@free-electrons.com> |
| Date: Tue, 18 Aug 2015 10:59:10 +0200 |
| Subject: mtd: pxa3xx_nand: add a default chunk size |
| |
| From: =?UTF-8?q?Antoine=20T=C3=A9nart?= <antoine.tenart@free-electrons.com> |
| |
| commit bc3e00f04cc1fe033a289c2fc2e5c73c0168d360 upstream. |
| |
| 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/mtd/nand/pxa3xx_nand.c | 3 +++ |
| 1 file changed, 3 insertions(+) |
| |
| --- a/drivers/mtd/nand/pxa3xx_nand.c |
| +++ b/drivers/mtd/nand/pxa3xx_nand.c |
| @@ -1463,6 +1463,9 @@ static int pxa3xx_nand_scan(struct mtd_i |
| 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", |
