Evolution-X-Devices/kernel_nothing_sm7325
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 5.4.206 into android11-5.4-lts

Browse Source 
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
parent a5112e9833 6584107915
commit f0aba2ea80
2 changed files with 2 additions and 2 deletions
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 = 4
SUBLEVEL = 205
SUBLEVEL = 206
EXTRAVERSION =
NAME = Kleptomaniac Octopus

2
drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
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}: