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

Commit eef2b13a authored by Miquel Raynal's avatar Miquel Raynal
Browse files

mtd: rawnand: jz4780: 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>
Acked-by: default avatarHarvey Hunt <harveyhuntnexus@gmail.com>
Reviewed-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
parent 07c1a4b3

drivers/mtd/nand/raw/jz4780_nand.c

+16 −18
Original line number Diff line number Diff line
@@ -158,9 +158,8 @@ static int jz4780_nand_ecc_correct(struct mtd_info *mtd, u8 *dat, 
	return jz4780_bch_correct(nfc->bch, &params, dat, read_ecc);

}



static int jz4780_nand_init_ecc(struct jz4780_nand_chip *nand, struct device *dev)

static int jz4780_nand_attach_chip(struct nand_chip *chip)

{

	struct nand_chip *chip = &nand->chip;

	struct mtd_info *mtd = nand_to_mtd(chip);

	struct jz4780_nand_controller *nfc = to_jz4780_nand_controller(chip->controller);

	int eccbytes;
@@ -171,7 +170,8 @@ static int jz4780_nand_init_ecc(struct jz4780_nand_chip *nand, struct device *de 
	switch (chip->ecc.mode) {

	case NAND_ECC_HW:

		if (!nfc->bch) {

			dev_err(dev, "HW BCH selected, but BCH controller not found\n");

			dev_err(nfc->dev,

				"HW BCH selected, but BCH controller not found\n");

			return -ENODEV;

		}
@@ -180,15 +180,16 @@ static int jz4780_nand_init_ecc(struct jz4780_nand_chip *nand, struct device *de 
		chip->ecc.correct = jz4780_nand_ecc_correct;

		/* fall through */

	case NAND_ECC_SOFT:

		dev_info(dev, "using %s (strength %d, size %d, bytes %d)\n",

		dev_info(nfc->dev, "using %s (strength %d, size %d, bytes %d)\n",

			 (nfc->bch) ? "hardware BCH" : "software ECC",

			 chip->ecc.strength, chip->ecc.size, chip->ecc.bytes);

		break;

	case NAND_ECC_NONE:

		dev_info(dev, "not using ECC\n");

		dev_info(nfc->dev, "not using ECC\n");

		break;

	default:

		dev_err(dev, "ECC mode %d not supported\n", chip->ecc.mode);

		dev_err(nfc->dev, "ECC mode %d not supported\n",

			chip->ecc.mode);

		return -EINVAL;

	}
@@ -200,7 +201,7 @@ static int jz4780_nand_init_ecc(struct jz4780_nand_chip *nand, struct device *de 
	eccbytes = mtd->writesize / chip->ecc.size * chip->ecc.bytes;



	if (eccbytes > mtd->oobsize - 2) {

		dev_err(dev,

		dev_err(nfc->dev,

			"invalid ECC config: required %d ECC bytes, but only %d are available",

			eccbytes, mtd->oobsize - 2);

		return -EINVAL;
@@ -211,6 +212,10 @@ static int jz4780_nand_init_ecc(struct jz4780_nand_chip *nand, struct device *de 
	return 0;

}



static const struct nand_controller_ops jz4780_nand_controller_ops = {

	.attach_chip = jz4780_nand_attach_chip,

};



static int jz4780_nand_init_chip(struct platform_device *pdev,

				struct jz4780_nand_controller *nfc,

				struct device_node *np,
@@ -280,15 +285,8 @@ static int jz4780_nand_init_chip(struct platform_device *pdev, 
	chip->controller = &nfc->controller;

	nand_set_flash_node(chip, np);



	ret = nand_scan_ident(mtd, 1, NULL);

	if (ret)

		return ret;



	ret = jz4780_nand_init_ecc(nand, dev);

	if (ret)

		return ret;



	ret = nand_scan_tail(mtd);

	chip->controller->ops = &jz4780_nand_controller_ops;

	ret = nand_scan(mtd, 1);

	if (ret)

		return ret;