Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'mtd/fixes-for-5.19-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux
Pull mtd fixes from Miquel RAynal:
"NAND controller fix:
- gpmi: Fix busy timeout setting (wrong calculation)
NAND chip driver fix:
- Thoshiba: Revert the commit introducing support for a chip that
might have been counterfeit"
* tag 'mtd/fixes-for-5.19-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux:
mtd: rawnand: gpmi: Fix setting busy timeout setting
Revert "mtd: rawnand: add support for Toshiba TC58NVG0S3HTA00 NAND flash"
+1
-4
+1
-1
drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
+1
-1
drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
···
890
890
hw->timing0 = BF_GPMI_TIMING0_ADDRESS_SETUP(addr_setup_cycles) |
891
891
BF_GPMI_TIMING0_DATA_HOLD(data_hold_cycles) |
892
892
BF_GPMI_TIMING0_DATA_SETUP(data_setup_cycles);
893
-
hw->timing1 = BF_GPMI_TIMING1_BUSY_TIMEOUT(busy_timeout_cycles * 4096);
893
+
hw->timing1 = BF_GPMI_TIMING1_BUSY_TIMEOUT(DIV_ROUND_UP(busy_timeout_cycles, 4096));
894
894
895
895
/*
896
896
* Derive NFC ideal delay from {3}:
-3
drivers/mtd/nand/raw/nand_ids.c
-3
drivers/mtd/nand/raw/nand_ids.c
···
29
29
{"TC58NVG0S3E 1G 3.3V 8-bit",
30
30
{ .id = {0x98, 0xd1, 0x90, 0x15, 0x76, 0x14, 0x01, 0x00} },
31
31
SZ_2K, SZ_128, SZ_128K, 0, 8, 64, NAND_ECC_INFO(1, SZ_512), },
32
-
{"TC58NVG0S3HTA00 1G 3.3V 8-bit",
33
-
{ .id = {0x98, 0xf1, 0x80, 0x15} },
34
-
SZ_2K, SZ_128, SZ_128K, 0, 4, 128, NAND_ECC_INFO(8, SZ_512), },
35
32
{"TC58NVG2S0F 4G 3.3V 8-bit",
36
33
{ .id = {0x98, 0xdc, 0x90, 0x26, 0x76, 0x15, 0x01, 0x08} },
37
34
SZ_4K, SZ_512, SZ_256K, 0, 8, 224, NAND_ECC_INFO(4, SZ_512) },