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

Commit 29714d6b authored by Miquel Raynal's avatar Miquel Raynal Committed by Boris Brezillon
Browse files

mtd: rawnand: move calls to ->select_chip() in nand_setup_data_interface() 



After a ->set_features(TIMINGS), the chip is supposed to be working at a
new speed. In order for all the transactions to be perperly handled, the
NAND controller should also be configured to this same speed. Calling
->setup_data_interface() is not enough and the chip should be
de-asserted/re-asserted through calls to ->select_chip().

Prepare the next change in nand_setup_data_interface() where timings
will be checked after being applied. Because assertions of the CS pin
will be needed from within this function, move the calls to
->select_chip() inside nand_setup_data_interface() for later
consistency.

Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
parent 939da447

drivers/mtd/nand/raw/nand_base.c

+2 −5
Original line number Diff line number Diff line
@@ -1274,8 +1274,10 @@ static int nand_setup_data_interface(struct nand_chip *chip, int chipnr) 


	/* Change the mode on the chip side (if supported by the NAND chip) */

	if (nand_supports_set_get_features(chip)) {

		chip->select_chip(mtd, chipnr);

		ret = nand_set_features(chip, ONFI_FEATURE_ADDR_TIMING_MODE,

					tmode_param);

		chip->select_chip(mtd, -1);

		if (ret)

			return ret;

	}
@@ -2780,10 +2782,8 @@ int nand_reset(struct nand_chip *chip, int chipnr) 
	if (ret)

		return ret;



	chip->select_chip(mtd, chipnr);

	chip->data_interface = saved_data_intf;

	ret = nand_setup_data_interface(chip, chipnr);

	chip->select_chip(mtd, -1);

	if (ret)

		return ret;
@@ -6505,10 +6505,7 @@ int nand_scan_tail(struct mtd_info *mtd) 


	/* Enter fastest possible mode on all dies. */

	for (i = 0; i < chip->numchips; i++) {

		chip->select_chip(mtd, i);

		ret = nand_setup_data_interface(chip, i);

		chip->select_chip(mtd, -1);



		if (ret)

			goto err_nand_manuf_cleanup;

	}