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

Commit 1ce7826d authored by Miquel Raynal's avatar Miquel Raynal
Browse files

mtd: rawnand: mtk: 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>
Acked-by: default avatarXiaolei Li <xiaolei.li@mediatek.com>
parent 8831e48b

drivers/mtd/nand/raw/mtk_nand.c

+44 −31
Original line number Diff line number Diff line
@@ -1250,13 +1250,54 @@ static int mtk_nfc_ecc_init(struct device *dev, struct mtd_info *mtd) 
	return 0;

}



static int mtk_nfc_attach_chip(struct nand_chip *chip)

{

	struct mtd_info *mtd = nand_to_mtd(chip);

	struct device *dev = mtd->dev.parent;

	struct mtk_nfc *nfc = nand_get_controller_data(chip);

	struct mtk_nfc_nand_chip *mtk_nand = to_mtk_nand(chip);

	int len;

	int ret;



	if (chip->options & NAND_BUSWIDTH_16) {

		dev_err(dev, "16bits buswidth not supported");

		return -EINVAL;

	}



	/* store bbt magic in page, cause OOB is not protected */

	if (chip->bbt_options & NAND_BBT_USE_FLASH)

		chip->bbt_options |= NAND_BBT_NO_OOB;



	ret = mtk_nfc_ecc_init(dev, mtd);

	if (ret)

		return ret;



	ret = mtk_nfc_set_spare_per_sector(&mtk_nand->spare_per_sector, mtd);

	if (ret)

		return ret;



	mtk_nfc_set_fdm(&mtk_nand->fdm, mtd);

	mtk_nfc_set_bad_mark_ctl(&mtk_nand->bad_mark, mtd);



	len = mtd->writesize + mtd->oobsize;

	nfc->buffer = devm_kzalloc(dev, len, GFP_KERNEL);

	if (!nfc->buffer)

		return  -ENOMEM;



	return 0;

}



static const struct nand_controller_ops mtk_nfc_controller_ops = {

	.attach_chip = mtk_nfc_attach_chip,

};



static int mtk_nfc_nand_chip_init(struct device *dev, struct mtk_nfc *nfc,

				  struct device_node *np)

{

	struct mtk_nfc_nand_chip *chip;

	struct nand_chip *nand;

	struct mtd_info *mtd;

	int nsels, len;

	int nsels;

	u32 tmp;

	int ret;

	int i;
@@ -1324,36 +1365,7 @@ static int mtk_nfc_nand_chip_init(struct device *dev, struct mtk_nfc *nfc, 


	mtk_nfc_hw_init(nfc);



	ret = nand_scan_ident(mtd, nsels, NULL);

	if (ret)

		return ret;



	/* store bbt magic in page, cause OOB is not protected */

	if (nand->bbt_options & NAND_BBT_USE_FLASH)

		nand->bbt_options |= NAND_BBT_NO_OOB;



	ret = mtk_nfc_ecc_init(dev, mtd);

	if (ret)

		return -EINVAL;



	if (nand->options & NAND_BUSWIDTH_16) {

		dev_err(dev, "16bits buswidth not supported");

		return -EINVAL;

	}



	ret = mtk_nfc_set_spare_per_sector(&chip->spare_per_sector, mtd);

	if (ret)

		return ret;



	mtk_nfc_set_fdm(&chip->fdm, mtd);

	mtk_nfc_set_bad_mark_ctl(&chip->bad_mark, mtd);



	len = mtd->writesize + mtd->oobsize;

	nfc->buffer = devm_kzalloc(dev, len, GFP_KERNEL);

	if (!nfc->buffer)

		return  -ENOMEM;



	ret = nand_scan_tail(mtd);

	ret = nand_scan(mtd, nsels);

	if (ret)

		return ret;
@@ -1443,6 +1455,7 @@ static int mtk_nfc_probe(struct platform_device *pdev) 
	spin_lock_init(&nfc->controller.lock);

	init_waitqueue_head(&nfc->controller.wq);

	INIT_LIST_HEAD(&nfc->chips);

	nfc->controller.ops = &mtk_nfc_controller_ops;



	/* probe defer if not ready */

	nfc->ecc = of_mtk_ecc_get(np);