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

Commit 6a9035ce authored by Miquel Raynal's avatar Miquel Raynal
Browse files

mtd: rawnand: tango: 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 2a4d9c16

drivers/mtd/nand/raw/tango_nand.c

+24 −16
Original line number Diff line number Diff line
@@ -517,6 +517,28 @@ static int tango_set_timings(struct mtd_info *mtd, int csline, 
	return 0;

}



static int tango_attach_chip(struct nand_chip *chip)

{

	struct nand_ecc_ctrl *ecc = &chip->ecc;



	ecc->mode = NAND_ECC_HW;

	ecc->algo = NAND_ECC_BCH;

	ecc->bytes = DIV_ROUND_UP(ecc->strength * FIELD_ORDER, BITS_PER_BYTE);



	ecc->read_page_raw = tango_read_page_raw;

	ecc->write_page_raw = tango_write_page_raw;

	ecc->read_page = tango_read_page;

	ecc->write_page = tango_write_page;

	ecc->read_oob = tango_read_oob;

	ecc->write_oob = tango_write_oob;



	return 0;

}



static const struct nand_controller_ops tango_controller_ops = {

	.attach_chip = tango_attach_chip,

};



static int chip_init(struct device *dev, struct device_node *np)

{

	u32 cs;
@@ -566,22 +588,7 @@ static int chip_init(struct device *dev, struct device_node *np) 
	mtd_set_ooblayout(mtd, &tango_nand_ooblayout_ops);

	mtd->dev.parent = dev;



	err = nand_scan_ident(mtd, 1, NULL);

	if (err)

		return err;



	ecc->mode = NAND_ECC_HW;

	ecc->algo = NAND_ECC_BCH;

	ecc->bytes = DIV_ROUND_UP(ecc->strength * FIELD_ORDER, BITS_PER_BYTE);



	ecc->read_page_raw = tango_read_page_raw;

	ecc->write_page_raw = tango_write_page_raw;

	ecc->read_page = tango_read_page;

	ecc->write_page = tango_write_page;

	ecc->read_oob = tango_read_oob;

	ecc->write_oob = tango_write_oob;



	err = nand_scan_tail(mtd);

	err = nand_scan(mtd, 1);

	if (err)

		return err;
@@ -655,6 +662,7 @@ static int tango_nand_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, nfc);

	nand_controller_init(&nfc->hw);

	nfc->hw.ops = &tango_controller_ops;

	nfc->freq_kHz = clk_get_rate(clk) / 1000;



	for_each_child_of_node(pdev->dev.of_node, np) {