mtd: rawnand: atmel: convert driver to nand_scan()
Two helpers have been added to the core to do all kind of controller side configuration/initialization between the detection phase and the final NAND scan. Implement these hooks so that we can convert the driver to just use nand_scan() instead of the nand_scan_ident() + nand_scan_tail() pair. Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Reviewed-by: Boris Brezillon <boris.brezillon@bootlin.com>
This commit is contained in:
parent
7928225ffc
commit
577e010c24
@ -201,7 +201,7 @@ struct atmel_nand_controller_ops {
|
||||
int (*remove)(struct atmel_nand_controller *nc);
|
||||
void (*nand_init)(struct atmel_nand_controller *nc,
|
||||
struct atmel_nand *nand);
|
||||
int (*ecc_init)(struct atmel_nand *nand);
|
||||
int (*ecc_init)(struct nand_chip *chip);
|
||||
int (*setup_data_interface)(struct atmel_nand *nand, int csline,
|
||||
const struct nand_data_interface *conf);
|
||||
};
|
||||
@ -1132,9 +1132,8 @@ static int atmel_nand_pmecc_init(struct nand_chip *chip)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int atmel_nand_ecc_init(struct atmel_nand *nand)
|
||||
static int atmel_nand_ecc_init(struct nand_chip *chip)
|
||||
{
|
||||
struct nand_chip *chip = &nand->base;
|
||||
struct atmel_nand_controller *nc;
|
||||
int ret;
|
||||
|
||||
@ -1169,12 +1168,11 @@ static int atmel_nand_ecc_init(struct atmel_nand *nand)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int atmel_hsmc_nand_ecc_init(struct atmel_nand *nand)
|
||||
static int atmel_hsmc_nand_ecc_init(struct nand_chip *chip)
|
||||
{
|
||||
struct nand_chip *chip = &nand->base;
|
||||
int ret;
|
||||
|
||||
ret = atmel_nand_ecc_init(nand);
|
||||
ret = atmel_nand_ecc_init(chip);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
@ -1557,22 +1555,6 @@ static void atmel_hsmc_nand_init(struct atmel_nand_controller *nc,
|
||||
chip->select_chip = atmel_hsmc_nand_select_chip;
|
||||
}
|
||||
|
||||
static int atmel_nand_detect(struct atmel_nand *nand)
|
||||
{
|
||||
struct nand_chip *chip = &nand->base;
|
||||
struct mtd_info *mtd = nand_to_mtd(chip);
|
||||
struct atmel_nand_controller *nc;
|
||||
int ret;
|
||||
|
||||
nc = to_nand_controller(chip->controller);
|
||||
|
||||
ret = nand_scan_ident(mtd, nand->numcs, NULL);
|
||||
if (ret)
|
||||
dev_err(nc->dev, "nand_scan_ident() failed: %d\n", ret);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int atmel_nand_controller_remove_nand(struct atmel_nand *nand)
|
||||
{
|
||||
struct nand_chip *chip = &nand->base;
|
||||
@ -1700,6 +1682,8 @@ static int
|
||||
atmel_nand_controller_add_nand(struct atmel_nand_controller *nc,
|
||||
struct atmel_nand *nand)
|
||||
{
|
||||
struct nand_chip *chip = &nand->base;
|
||||
struct mtd_info *mtd = nand_to_mtd(chip);
|
||||
int ret;
|
||||
|
||||
/* No card inserted, skip this NAND. */
|
||||
@ -1710,44 +1694,9 @@ atmel_nand_controller_add_nand(struct atmel_nand_controller *nc,
|
||||
|
||||
nc->caps->ops->nand_init(nc, nand);
|
||||
|
||||
ret = atmel_nand_detect(nand);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = nc->caps->ops->ecc_init(nand);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
if (nc->caps->legacy_of_bindings || !nc->dev->of_node) {
|
||||
/*
|
||||
* We keep the MTD name unchanged to avoid breaking platforms
|
||||
* where the MTD cmdline parser is used and the bootloader
|
||||
* has not been updated to use the new naming scheme.
|
||||
*/
|
||||
mtd->name = "atmel_nand";
|
||||
} else if (!mtd->name) {
|
||||
/*
|
||||
* If the new bindings are used and the bootloader has not been
|
||||
* updated to pass a new mtdparts parameter on the cmdline, you
|
||||
* should define the following property in your nand node:
|
||||
*
|
||||
* label = "atmel_nand";
|
||||
*
|
||||
* This way, mtd->name will be set by the core when
|
||||
* nand_set_flash_node() is called.
|
||||
*/
|
||||
mtd->name = devm_kasprintf(nc->dev, GFP_KERNEL,
|
||||
"%s:nand.%d", dev_name(nc->dev),
|
||||
nand->cs[0].id);
|
||||
if (!mtd->name) {
|
||||
dev_err(nc->dev, "Failed to allocate mtd->name\n");
|
||||
return -ENOMEM;
|
||||
}
|
||||
}
|
||||
|
||||
ret = nand_scan_tail(mtd);
|
||||
ret = nand_scan(mtd, nand->numcs);
|
||||
if (ret) {
|
||||
dev_err(nc->dev, "nand_scan_tail() failed: %d\n", ret);
|
||||
dev_err(nc->dev, "NAND scan failed: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -1945,6 +1894,51 @@ static const struct of_device_id atmel_matrix_of_ids[] = {
|
||||
{ /* sentinel */ },
|
||||
};
|
||||
|
||||
static int atmel_nand_attach_chip(struct nand_chip *chip)
|
||||
{
|
||||
struct atmel_nand_controller *nc = to_nand_controller(chip->controller);
|
||||
struct atmel_nand *nand = to_atmel_nand(chip);
|
||||
struct mtd_info *mtd = nand_to_mtd(chip);
|
||||
int ret;
|
||||
|
||||
ret = nc->caps->ops->ecc_init(chip);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
if (nc->caps->legacy_of_bindings || !nc->dev->of_node) {
|
||||
/*
|
||||
* We keep the MTD name unchanged to avoid breaking platforms
|
||||
* where the MTD cmdline parser is used and the bootloader
|
||||
* has not been updated to use the new naming scheme.
|
||||
*/
|
||||
mtd->name = "atmel_nand";
|
||||
} else if (!mtd->name) {
|
||||
/*
|
||||
* If the new bindings are used and the bootloader has not been
|
||||
* updated to pass a new mtdparts parameter on the cmdline, you
|
||||
* should define the following property in your nand node:
|
||||
*
|
||||
* label = "atmel_nand";
|
||||
*
|
||||
* This way, mtd->name will be set by the core when
|
||||
* nand_set_flash_node() is called.
|
||||
*/
|
||||
mtd->name = devm_kasprintf(nc->dev, GFP_KERNEL,
|
||||
"%s:nand.%d", dev_name(nc->dev),
|
||||
nand->cs[0].id);
|
||||
if (!mtd->name) {
|
||||
dev_err(nc->dev, "Failed to allocate mtd->name\n");
|
||||
return -ENOMEM;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct nand_controller_ops atmel_nand_controller_ops = {
|
||||
.attach_chip = atmel_nand_attach_chip,
|
||||
};
|
||||
|
||||
static int atmel_nand_controller_init(struct atmel_nand_controller *nc,
|
||||
struct platform_device *pdev,
|
||||
const struct atmel_nand_controller_caps *caps)
|
||||
@ -1954,6 +1948,7 @@ static int atmel_nand_controller_init(struct atmel_nand_controller *nc,
|
||||
int ret;
|
||||
|
||||
nand_controller_init(&nc->base);
|
||||
nc->base.ops = &atmel_nand_controller_ops;
|
||||
INIT_LIST_HEAD(&nc->chips);
|
||||
nc->dev = dev;
|
||||
nc->caps = caps;
|
||||
|
Loading…
x
Reference in New Issue
Block a user