summaryrefslogtreecommitdiff
path: root/drivers/mtd/nand
diff options
context:
space:
mode:
authorHan Xu <han.xu@nxp.com>2022-10-07 11:50:20 -0500
committerHan Xu <han.xu@nxp.com>2022-10-07 11:50:20 -0500
commite6beeccf407befa194fe362321dc28a497d64141 (patch)
tree720f3ef471f94b192ee06aca80a17e2f49d6b215 /drivers/mtd/nand
parente69ead791b410fa21f4800cb4c82188a8608d9a8 (diff)
Revert "Revert "mtd: rawnand: gpmi: Fix setting busy timeout setting""
This reverts commit c80b15105a08dceffcbb0381f85696b46bce0d1b. The GPMI timeout issue should be fixed by the following upstream commit rather than reverting the buggy commit. [ Upstream commit 0fddf9ad06fd9f439f137139861556671673e31c ]
Diffstat (limited to 'drivers/mtd/nand')
-rw-r--r--drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
index 909ef222ab46..2636b6bdb677 100644
--- a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
@@ -902,7 +902,7 @@ static int gpmi_nfc_compute_timings(struct gpmi_nand_data *this,
hw->timing0 = BF_GPMI_TIMING0_ADDRESS_SETUP(addr_setup_cycles) |
BF_GPMI_TIMING0_DATA_HOLD(data_hold_cycles) |
BF_GPMI_TIMING0_DATA_SETUP(data_setup_cycles);
- hw->timing1 = BF_GPMI_TIMING1_BUSY_TIMEOUT(busy_timeout_cycles * 4096);
+ hw->timing1 = BF_GPMI_TIMING1_BUSY_TIMEOUT(DIV_ROUND_UP(busy_timeout_cycles, 4096));
/*
* Derive NFC ideal delay from {3}: