diff options
| author | Tom Rini <[email protected]> | 2025-08-24 08:01:29 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-08-24 08:01:29 -0600 |
| commit | 7d879baa6f7ca201bcecff74f2a7545560289280 (patch) | |
| tree | 6db824735894dbc99da07cbdd7a961d92f6e9d15 /drivers | |
| parent | cb0b67fa49df836627230ba62fc718ea4afddf60 (diff) | |
| parent | 6b156c62ced25d3f8aed64c81e471353b56d0f2c (diff) | |
Merge branch 'u-boot-nand-23082025' of https://source.denx.de/u-boot/custodians/u-boot-nand-flash
CI: https://source.denx.de/u-boot/custodians/u-boot-nand-flash/-/pipelines/27449
This series address issues found by Andrew Goodbody and David Regan. Add
a new benchmark tool from Miguel and small feature
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/nand/core.c | 7 | ||||
| -rw-r--r-- | drivers/mtd/nand/raw/cadence_nand.c | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/drivers/mtd/nand/core.c b/drivers/mtd/nand/core.c index 472ad0bdefb..01ff6e3befa 100644 --- a/drivers/mtd/nand/core.c +++ b/drivers/mtd/nand/core.c @@ -201,8 +201,8 @@ EXPORT_SYMBOL_GPL(nanddev_mtd_erase); int nanddev_init(struct nand_device *nand, const struct nand_ops *ops, struct module *owner) { - struct mtd_info *mtd = nanddev_to_mtd(nand); - struct nand_memory_organization *memorg = nanddev_get_memorg(nand); + struct mtd_info *mtd; + struct nand_memory_organization *memorg; if (!nand || !ops) return -EINVAL; @@ -210,6 +210,9 @@ int nanddev_init(struct nand_device *nand, const struct nand_ops *ops, if (!ops->erase || !ops->markbad || !ops->isbad) return -EINVAL; + mtd = nanddev_to_mtd(nand); + memorg = nanddev_get_memorg(nand); + if (!memorg->bits_per_cell || !memorg->pagesize || !memorg->pages_per_eraseblock || !memorg->eraseblocks_per_lun || !memorg->planes_per_lun || !memorg->luns_per_target || diff --git a/drivers/mtd/nand/raw/cadence_nand.c b/drivers/mtd/nand/raw/cadence_nand.c index 27aa7f97a45..4771440d1de 100644 --- a/drivers/mtd/nand/raw/cadence_nand.c +++ b/drivers/mtd/nand/raw/cadence_nand.c @@ -2196,7 +2196,7 @@ static int cadence_nand_chip_init(struct cadence_nand_info *cadence, ofnode node chip->controller = &cadence->controller; nand_set_flash_node(chip, node); mtd = nand_to_mtd(chip); - mtd->dev->parent = cadence->dev; + mtd->dev = cadence->dev; chip->options |= NAND_BUSWIDTH_AUTO; chip->select_chip = cadence_nand_select_chip; |