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

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

mtd: rawnand: txx9ndfmc: 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 abe23d1c

drivers/mtd/nand/raw/txx9ndfmc.c

+17 −17
Original line number Diff line number Diff line
@@ -254,13 +254,10 @@ static void txx9ndfmc_initialize(struct platform_device *dev) 
#define TXX9NDFMC_NS_TO_CYC(gbusclk, ns) \

	DIV_ROUND_UP((ns) * DIV_ROUND_UP(gbusclk, 1000), 1000000)



static int txx9ndfmc_nand_scan(struct mtd_info *mtd)

static int txx9ndfmc_attach_chip(struct nand_chip *chip)

{

	struct nand_chip *chip = mtd_to_nand(mtd);

	int ret;

	struct mtd_info *mtd = nand_to_mtd(chip);



	ret = nand_scan_ident(mtd, 1, NULL);

	if (!ret) {

	if (mtd->writesize >= 512) {

		chip->ecc.size = 512;

		chip->ecc.bytes = 6;
@@ -269,11 +266,13 @@ static int txx9ndfmc_nand_scan(struct mtd_info *mtd) 
		chip->ecc.bytes = 3;

	}



		ret = nand_scan_tail(mtd);

	}

	return ret;

	return 0;

}



static const struct nand_controller_ops txx9ndfmc_controller_ops = {

	.attach_chip = txx9ndfmc_attach_chip,

};



static int __init txx9ndfmc_probe(struct platform_device *dev)

{

	struct txx9ndfmc_platform_data *plat = dev_get_platdata(&dev->dev);
@@ -307,6 +306,7 @@ static int __init txx9ndfmc_probe(struct platform_device *dev) 
		 (gbusclk + 500000) / 1000000, hold, spw);



	nand_controller_init(&drvdata->controller);

	drvdata->controller.ops = &txx9ndfmc_controller_ops;



	platform_set_drvdata(dev, drvdata);

	txx9ndfmc_initialize(dev);
@@ -359,7 +359,7 @@ static int __init txx9ndfmc_probe(struct platform_device *dev) 
		if (plat->wide_mask & (1 << i))

			chip->options |= NAND_BUSWIDTH_16;



		if (txx9ndfmc_nand_scan(mtd)) {

		if (nand_scan(mtd, 1)) {

			kfree(txx9_priv->mtdname);

			kfree(txx9_priv);

			continue;