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

Commit f0aba2ea authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 5.4.206 into android11-5.4-lts 



Changes in 5.4.206
	Revert "mtd: rawnand: gpmi: Fix setting busy timeout setting"
	Linux 5.4.206

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Iecbec19ddfa3ee5436a3feb3d89e92bfd30fc2c5
parents a5112e98 65841079

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 205

SUBLEVEL = 206

EXTRAVERSION =

NAME = Kleptomaniac Octopus

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

+1 −1
Original line number Diff line number Diff line
@@ -682,7 +682,7 @@ static void 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(DIV_ROUND_UP(busy_timeout_cycles, 4096));

	hw->timing1 = BF_GPMI_TIMING1_BUSY_TIMEOUT(busy_timeout_cycles * 4096);



	/*

	 * Derive NFC ideal delay from {3}: