anierin/msm-5.15
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 5.15.55 into android13-5.15-lts

Browse Source 
Changes in 5.15.55
	Revert "mtd: rawnand: gpmi: Fix setting busy timeout setting"
	Linux 5.15.55

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ic7fd790a9d82f116cf0b0fed3255ff09d6e0337c
This commit is contained in:
Greg Kroah-Hartman
2022-08-04 14:56:39 +02:00
parent ac9bace423 baefa2315c
commit 22aed70fc1
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 = 15
SUBLEVEL = 54
SUBLEVEL = 55
EXTRAVERSION =
NAME = Trick or Treat

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

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