Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37b0375d authored by Miquel Raynal's avatar Miquel Raynal
Browse files

mtd: rawnand: fsl_ifc: 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: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Reviewed-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
parent 5bf3e76b

drivers/mtd/nand/raw/fsl_ifc_nand.c

+8 −11
Original line number Diff line number Diff line
@@ -714,9 +714,9 @@ static int fsl_ifc_write_page(struct mtd_info *mtd, struct nand_chip *chip, 
	return nand_prog_page_end_op(chip);

}



static int fsl_ifc_chip_init_tail(struct mtd_info *mtd)

static int fsl_ifc_attach_chip(struct nand_chip *chip)

{

	struct nand_chip *chip = mtd_to_nand(mtd);

	struct mtd_info *mtd = nand_to_mtd(chip);

	struct fsl_ifc_mtd *priv = nand_get_controller_data(chip);



	dev_dbg(priv->dev, "%s: nand->numchips = %d\n", __func__,
@@ -757,6 +757,10 @@ static int fsl_ifc_chip_init_tail(struct mtd_info *mtd) 
	return 0;

}



static const struct nand_controller_ops fsl_ifc_controller_ops = {

	.attach_chip = fsl_ifc_attach_chip,

};



static void fsl_ifc_sram_init(struct fsl_ifc_mtd *priv)

{

	struct fsl_ifc_ctrl *ctrl = priv->ctrl;
@@ -1046,15 +1050,8 @@ static int fsl_ifc_nand_probe(struct platform_device *dev) 
	if (ret)

		goto err;



	ret = nand_scan_ident(mtd, 1, NULL);

	if (ret)

		goto err;



	ret = fsl_ifc_chip_init_tail(mtd);

	if (ret)

		goto err;



	ret = nand_scan_tail(mtd);

	priv->chip.controller->ops = &fsl_ifc_controller_ops;

	ret = nand_scan(mtd, 1);

	if (ret)

		goto err;