[PATCH] mtd: rawnand: marvell: pass ms delay to wait_op

Boris Brezillon boris.brezillon at bootlin.com
Mon May 7 00:41:42 PDT 2018


On Thu,  3 May 2018 14:21:28 +1200
Chris Packham <chris.packham at alliedtelesis.co.nz> wrote:

> 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: 02f26ecf8c772 ("mtd: nand: add reworked Marvell NAND controller driver")
> Cc: stable at vger.kernel.org
> Signed-off-by: Chris Packham <chris.packham at alliedtelesis.co.nz>

Queued to mtd/fixes.

Thanks,

Boris

> ---
>  drivers/mtd/nand/raw/marvell_nand.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/mtd/nand/raw/marvell_nand.c b/drivers/mtd/nand/raw/marvell_nand.c
> index 1d779a35ac8e..e4b964fd40d8 100644
> --- a/drivers/mtd/nand/raw/marvell_nand.c
> +++ b/drivers/mtd/nand/raw/marvell_nand.c
> @@ -1074,7 +1074,7 @@ static int marvell_nfc_hw_ecc_hmg_do_write_page(struct nand_chip *chip,
>  		return ret;
>  
>  	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;
>  }
>  
> @@ -1494,7 +1494,7 @@ static int marvell_nfc_hw_ecc_bch_write_page(struct mtd_info *mtd,
>  	}
>  
>  	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);
>  




More information about the linux-mtd mailing list