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

Commit 2a4d9c16 authored by Miquel Raynal's avatar Miquel Raynal
Browse files

mtd: rawnand: sunxi: 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 5f20da0f

drivers/mtd/nand/raw/sunxi_nand.c

+19 −24
Original line number Original line Diff line number Diff line
@@ -1814,12 +1814,21 @@ static void sunxi_nand_ecc_cleanup(struct nand_ecc_ctrl *ecc) 
	}

	}

}

}





static int sunxi_nand_ecc_init(struct mtd_info *mtd, struct nand_ecc_ctrl *ecc,

static int sunxi_nand_attach_chip(struct nand_chip *nand)

			       struct device_node *np)

{

{

	struct nand_chip *nand = mtd_to_nand(mtd);

	struct mtd_info *mtd = nand_to_mtd(nand);

	struct nand_ecc_ctrl *ecc = &nand->ecc;

	struct device_node *np = nand_get_flash_node(nand);

	int ret;

	int ret;





	if (nand->bbt_options & NAND_BBT_USE_FLASH)

		nand->bbt_options |= NAND_BBT_NO_OOB;



	if (nand->options & NAND_NEED_SCRAMBLING)

		nand->options |= NAND_NO_SUBPAGE_WRITE;



	nand->options |= NAND_SUBPAGE_READ;



	if (!ecc->size) {

	if (!ecc->size) {

		ecc->size = nand->ecc_step_ds;

		ecc->size = nand->ecc_step_ds;

		ecc->strength = nand->ecc_strength_ds;

		ecc->strength = nand->ecc_strength_ds;
@@ -1844,6 +1853,10 @@ static int sunxi_nand_ecc_init(struct mtd_info *mtd, struct nand_ecc_ctrl *ecc, 
	return 0;

	return 0;

}

}





static const struct nand_controller_ops sunxi_nand_controller_ops = {

	.attach_chip = sunxi_nand_attach_chip,

};



static int sunxi_nand_chip_init(struct device *dev, struct sunxi_nfc *nfc,

static int sunxi_nand_chip_init(struct device *dev, struct sunxi_nfc *nfc,

				struct device_node *np)

				struct device_node *np)

{

{
@@ -1909,6 +1922,8 @@ static int sunxi_nand_chip_init(struct device *dev, struct sunxi_nfc *nfc, 
	/* Default tR value specified in the ONFI spec (chapter 4.15.1) */

	/* Default tR value specified in the ONFI spec (chapter 4.15.1) */

	nand->chip_delay = 200;

	nand->chip_delay = 200;

	nand->controller = &nfc->controller;

	nand->controller = &nfc->controller;

	nand->controller->ops = &sunxi_nand_controller_ops;



	/*

	/*

	 * Set the ECC mode to the default value in case nothing is specified

	 * Set the ECC mode to the default value in case nothing is specified

	 * in the DT.

	 * in the DT.
@@ -1925,30 +1940,10 @@ static int sunxi_nand_chip_init(struct device *dev, struct sunxi_nfc *nfc, 
	mtd = nand_to_mtd(nand);

	mtd = nand_to_mtd(nand);

	mtd->dev.parent = dev;

	mtd->dev.parent = dev;





	ret = nand_scan_ident(mtd, nsels, NULL);

	ret = nand_scan(mtd, nsels);

	if (ret)

	if (ret)

		return ret;

		return ret;





	if (nand->bbt_options & NAND_BBT_USE_FLASH)

		nand->bbt_options |= NAND_BBT_NO_OOB;



	if (nand->options & NAND_NEED_SCRAMBLING)

		nand->options |= NAND_NO_SUBPAGE_WRITE;



	nand->options |= NAND_SUBPAGE_READ;



	ret = sunxi_nand_ecc_init(mtd, &nand->ecc, np);

	if (ret) {

		dev_err(dev, "ECC init failed: %d\n", ret);

		return ret;

	}



	ret = nand_scan_tail(mtd);

	if (ret) {

		dev_err(dev, "nand_scan_tail failed: %d\n", ret);

		return ret;

	}



	ret = mtd_device_register(mtd, NULL, 0);

	ret = mtd_device_register(mtd, NULL, 0);

	if (ret) {

	if (ret) {

		dev_err(dev, "failed to register mtd device: %d\n", ret);

		dev_err(dev, "failed to register mtd device: %d\n", ret);