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

Commit b76401fc authored by Chris Packham's avatar Chris Packham Committed by Boris Brezillon
Browse files

mtd: rawnand: marvell: pass ms delay to wait_op 



marvell_nfc_wait_op() expects the delay to be expressed in milliseconds
but nand_sdr_timings uses picoseconds. Use PSEC_TO_MSEC when passing
tPROG_max to marvell_nfc_wait_op().

Fixes: 02f26ecf ("mtd: nand: add reworked Marvell NAND controller driver")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarChris Packham <chris.packham@alliedtelesis.co.nz>
Reviewed-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
parent 6732cfd4

drivers/mtd/nand/raw/marvell_nand.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1074,7 +1074,7 @@ static int marvell_nfc_hw_ecc_hmg_do_write_page(struct nand_chip *chip, 
		return ret;

		return ret;





	ret = marvell_nfc_wait_op(chip,

	ret = marvell_nfc_wait_op(chip,

				  chip->data_interface.timings.sdr.tPROG_max);

				  PSEC_TO_MSEC(chip->data_interface.timings.sdr.tPROG_max));

	return ret;

	return ret;

}

}
@@ -1494,7 +1494,7 @@ static int marvell_nfc_hw_ecc_bch_write_page(struct mtd_info *mtd, 
	}

	}





	ret = marvell_nfc_wait_op(chip,

	ret = marvell_nfc_wait_op(chip,

				  chip->data_interface.timings.sdr.tPROG_max);

				  PSEC_TO_MSEC(chip->data_interface.timings.sdr.tPROG_max));





	marvell_nfc_disable_hw_ecc(chip);

	marvell_nfc_disable_hw_ecc(chip);