SUNLIGHT: Merge commit c2e9702 into 5.18

Description: - Base LTS Branch: 5.18 - Base LTS Version: 5.18.12 - Base LTS URL: https://github.com/ionutnechita/linux-sunlight.git - Base Remote LTS Branch: linux-5.18.y - Base Remote LTS Version: 5.18.12 - Base Remote LTS URL: https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux.git - Commit: c2e9702 Bug: https://bugs.launchpad.net/sunlight/+bug/1981903 Signed-off-by: Ionut Nechita <[email protected]> Change-Id: Ie81ac43e7f579353bbfe1a405c445cf07b0e4452
sunlightlinux · Jul 16, 2022 · f6349c7 · f6349c7
2 parents 88e0e33 + c2e9702
commit f6349c7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 5
 PATCHLEVEL = 18
-SUBLEVEL = 11
+SUBLEVEL = 12
 EXTRAVERSION =
 NAME = Superb Owl
 

diff --git a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
@@ -695,7 +695,7 @@ static int 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}: