shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 03:15:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge 5.10.131 into android13-5.10-lts

Browse Source 
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: I9e3e07f02973b5f503ab50869ea517a3565af7ff
This commit is contained in:
Greg Kroah-Hartman
2022-08-10 17:52:46 +02:00
parent df1d4ee9d7 8f95261a00
commit ea867e8307
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 # SPDX-License-Identifier: GPL-2.0
VERSION = 5 VERSION = 5
PATCHLEVEL = 10 PATCHLEVEL = 10
SUBLEVEL = 130 SUBLEVEL = 131
EXTRAVERSION = EXTRAVERSION =
NAME = Dare mighty things 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) | hw->timing0 = BF_GPMI_TIMING0_ADDRESS_SETUP(addr_setup_cycles) |
BF_GPMI_TIMING0_DATA_HOLD(data_hold_cycles) | BF_GPMI_TIMING0_DATA_HOLD(data_hold_cycles) |
BF_GPMI_TIMING0_DATA_SETUP(data_setup_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}: * Derive NFC ideal delay from {3}: