This is the 5.4.206 stable release

-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmLRJCsACgkQONu9yGCS
 aT6qFRAAzSBx2rp2vzfGsamjZOVc5olA0K8zq4JOagbYfw9NwLGM1utdvwey6mwl
 QjIFmEPnnv+KdmPoIU4G5aOAEBF9hEvEZbZc5/MiRB/WZM2/vkV8+8hYSBQkDMke
 wKb0vJGrQl4EAcohCTbUYWj3Op6VjMJYlUb/vthl0SVaQkR4KdfUd1JWhqe7goAq
 6Vc5WoqL6Z6HuskvJsJzsIexl4fvTwcRqY8zK5xWw/htrqKX++1GNd1v0BLEk5E6
 WY2cZRcEeWRuIi4jLT2ir+GDUDA0rDE+zQDek3DV701kCrAxabGioallDTIt1PUF
 ZwgsB6zOQuRDVaDI+NyRM3+pYb1TfnaDeXxIaRNq4k4Q8es9PYiW300pq5j5pLji
 N1UH7QgISrAHEwdjxYhJ/N4Fv9+8zhUSdVbn+oeiwU195XPU/vuPGvraFbeXwc4T
 9dvTg87wqBYxB9HWhAqxWaiunLFtQUCAo+sfjFRNZvqHwQDPFrditQ3EEywL8NQ5
 MLFvvlXMHRn4d7riau6oJI84Se3I88qlLExlzzcR5dB+G6qoW2l0mt6nSejJI0ND
 gmZa2qpTK+A4Bsl6hvS0v8BD+c9UDYgQBitu3yoSzNee8RlfdaMkOM43WpMzNJim
 Pzzr+HK5snhIcjMZglIrAKr6KGYsi/BLf92q1QCQGfgoldc5jHc=
 =IsH4
 -----END PGP SIGNATURE-----

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: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Iecbec19ddfa3ee5436a3feb3d89e92bfd30fc2c5
This commit is contained in:
Greg Kroah-Hartman 2022-07-15 14:31:51 +02:00
commit f0aba2ea80
2 changed files with 2 additions and 2 deletions

View file

@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
VERSION = 5
PATCHLEVEL = 4
SUBLEVEL = 205
SUBLEVEL = 206
EXTRAVERSION =
NAME = Kleptomaniac Octopus

View file

@ -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}: