Commit 68e77ffb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mtd/fixes-for-5.19-final' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux 

Pull MTD fix from Richard Weinberger:
 "A aingle NAND controller fix:

   - gpmi: Fix busy timeout setting (wrong calculation, yes again)"

* tag 'mtd/fixes-for-5.19-final' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux:
  mtd: rawnand: gpmi: Set WAIT_FOR_READY timeout based on program/erase times
parents 7ca433dc 0fddf9ad

drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c

+4 −2
Original line number Diff line number Diff line
@@ -850,9 +850,10 @@ static int gpmi_nfc_compute_timings(struct gpmi_nand_data *this, 
	unsigned int tRP_ps;

	bool use_half_period;

	int sample_delay_ps, sample_delay_factor;

	u16 busy_timeout_cycles;

	unsigned int busy_timeout_cycles;

	u8 wrn_dly_sel;

	unsigned long clk_rate, min_rate;

	u64 busy_timeout_ps;



	if (sdr->tRC_min >= 30000) {

		/* ONFI non-EDO modes [0-3] */
@@ -885,7 +886,8 @@ static int gpmi_nfc_compute_timings(struct gpmi_nand_data *this, 
	addr_setup_cycles = TO_CYCLES(sdr->tALS_min, period_ps);

	data_setup_cycles = TO_CYCLES(sdr->tDS_min, period_ps);

	data_hold_cycles = TO_CYCLES(sdr->tDH_min, period_ps);

	busy_timeout_cycles = TO_CYCLES(sdr->tWB_max + sdr->tR_max, period_ps);

	busy_timeout_ps = max(sdr->tBERS_max, sdr->tPROG_max);

	busy_timeout_cycles = TO_CYCLES(busy_timeout_ps, period_ps);



	hw->timing0 = BF_GPMI_TIMING0_ADDRESS_SETUP(addr_setup_cycles) |

		      BF_GPMI_TIMING0_DATA_HOLD(data_hold_cycles) |