mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
mtd: nand: omap: use DT specified bus-width only for scanning NAND device
This patch: - calls nand_scan_ident() using bus-width as passed by DT - removes double calls to nand_scan_ident(), in case first call fails then omap_nand_probe just returns error. Signed-off-by: Pekon Gupta <pekon@ti.com> Tested-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
This commit is contained in:
parent
633deb58e1
commit
f18befb57b
1 changed files with 9 additions and 12 deletions
|
@ -1856,7 +1856,6 @@ static int omap_nand_probe(struct platform_device *pdev)
|
|||
mtd->name = dev_name(&pdev->dev);
|
||||
mtd->owner = THIS_MODULE;
|
||||
nand_chip = &info->nand;
|
||||
nand_chip->options = pdata->devsize;
|
||||
nand_chip->options |= NAND_SKIP_BBTSCAN;
|
||||
#ifdef CONFIG_MTD_NAND_OMAP_BCH
|
||||
info->of_node = pdata->of_node;
|
||||
|
@ -1904,6 +1903,15 @@ static int omap_nand_probe(struct platform_device *pdev)
|
|||
nand_chip->chip_delay = 50;
|
||||
}
|
||||
|
||||
/* scan NAND device connected to chip controller */
|
||||
nand_chip->options |= pdata->devsize & NAND_BUSWIDTH_16;
|
||||
if (nand_scan_ident(mtd, 1, NULL)) {
|
||||
pr_err("nand device scan failed, may be bus-width mismatch\n");
|
||||
err = -ENXIO;
|
||||
goto out_release_mem_region;
|
||||
}
|
||||
|
||||
/* re-populate low-level callbacks based on xfer modes */
|
||||
switch (pdata->xfer_type) {
|
||||
case NAND_OMAP_PREFETCH_POLLED:
|
||||
nand_chip->read_buf = omap_read_buf_pref;
|
||||
|
@ -2011,17 +2019,6 @@ static int omap_nand_probe(struct platform_device *pdev)
|
|||
}
|
||||
}
|
||||
|
||||
/* DIP switches on some boards change between 8 and 16 bit
|
||||
* bus widths for flash. Try the other width if the first try fails.
|
||||
*/
|
||||
if (nand_scan_ident(mtd, 1, NULL)) {
|
||||
nand_chip->options ^= NAND_BUSWIDTH_16;
|
||||
if (nand_scan_ident(mtd, 1, NULL)) {
|
||||
err = -ENXIO;
|
||||
goto out_release_mem_region;
|
||||
}
|
||||
}
|
||||
|
||||
/* rom code layout */
|
||||
if (pdata->ecc_opt == OMAP_ECC_HAM1_CODE_HW) {
|
||||
|
||||
|
|
Loading…
Reference in a new issue