android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

This is the 5.10.131 stable release

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmLRIcsACgkQONu9yGCS
 aT4Q/A/+PrANybHEiijhj3e+8PgzJsdvaoHo+3xu5p6WLfgTd4aJVsvgefdWshc2
 wjpg8CV16UUgGd9XtBAf7lDRGaAkjbqGXKqvpPHIhIj6+N6BfRCuYd2gEeKVk2K5
 hoU/Z4ghEcUOpH9SnHwXrjkTDHfl30UTS4VZUSNgVoVt38UapH3BAKffjVGITJ9J
 l1Uga5Pg+jZpxUFnJ7a+9mJ1hLUwiDB0cDX/04bOTH1XSoOgOAa5kLcyb0FK8Sai
 bJkvU+Y0eLLCmyW/3vrmpLalK5GydI0yIkwlQPyIVzbETHsQ6Nt0Lr89mqlryHK8
 fB2uLSxTxU97IPExfrWL8hcHA+YQcW/2aYzfrhf02a/xcw4d5YYM5rurn8O3WBjF
 /5VvDgu7+UQwUVVx2pgvIGPOivLsoY/9M3+wCLsjCiLE9E0SmEGAsbLeXDWxR/UI
 FVG3ICyUUb+/SOpKhT/96yLp6nnEWVdlQjhNUfYsAbLOiawJzCHn989iHZciGJ5b
 HKRsJFuIP0KGt+oF0cNVlGgLQRUJa8CQr46mkN8nE31LqzQn32NCxnBDqoOyxoBU
 z17L+tyAjlBoc3dgT2IKRd/jMlTPG6hB5+sPIFl06Bo7Ll8aDFclCYUMkCNFfSZJ
 0W70+xLiMEKheRmDtrr9y+q8A1UZV3ZQGKeIb4hT8i98Sg7FHfk=
 =rk21
 -----END PGP SIGNATURE-----

Merge 5.10.131 into android12-5.10-lts

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

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ic4e1d9df0f6af37bc76c1d62da9df05dd73e5639
This commit is contained in:
Greg Kroah-Hartman 2022-07-28 17:14:40 +02:00
commit ccdb3f9143
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
VERSION = 5
PATCHLEVEL = 10
SUBLEVEL = 130
SUBLEVEL = 131
EXTRAVERSION =
NAME = Dare mighty things

2
drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
View File

@ -683,7 +683,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}: