forked from Openwrt/openwrt
b71c870caa
These patches were earlier mislabled as v6.1 and therefore dropped. They are in fact from v6.2. Fixes boot failure on ASUS TUF-AX4200 Reviewed-by: Robert Marko <robimarko@gmail.com> Signed-off-by: Bjørn Mork <bjorn@mork.no>
41 lines
1.8 KiB
Diff
41 lines
1.8 KiB
Diff
From dbf70fc204d2fbb0d8ad8f42038a60846502efda Mon Sep 17 00:00:00 2001
|
|
From: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
|
|
Date: Mon, 10 Oct 2022 13:51:09 +0300
|
|
Subject: [PATCH] mtd: spinand: winbond: fix flash identification
|
|
|
|
Winbond uses 3 bytes to identify flash: vendor_id, dev_id_0, dev_id_1,
|
|
but current driver uses only first 2 bytes of it for devices
|
|
identification. As result Winbond W25N02KV flash (id_bytes: EF, AA, 22)
|
|
is identified as W25N01GV (id_bytes: EF, AA, 21).
|
|
|
|
Fix this by adding missed identification bytes.
|
|
|
|
Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
|
|
Reviewed-by: Frieder Schrempf <frieder.schrempf@kontron.de>
|
|
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
|
|
Link: https://lore.kernel.org/linux-mtd/20221010105110.446674-1-mikhail.kshevetskiy@iopsys.eu
|
|
---
|
|
drivers/mtd/nand/spi/winbond.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/mtd/nand/spi/winbond.c
|
|
+++ b/drivers/mtd/nand/spi/winbond.c
|
|
@@ -76,7 +76,7 @@ static int w25m02gv_select_target(struct
|
|
|
|
static const struct spinand_info winbond_spinand_table[] = {
|
|
SPINAND_INFO("W25M02GV",
|
|
- SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xab),
|
|
+ SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xab, 0x21),
|
|
NAND_MEMORG(1, 2048, 64, 64, 1024, 20, 1, 1, 2),
|
|
NAND_ECCREQ(1, 512),
|
|
SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
|
|
@@ -86,7 +86,7 @@ static const struct spinand_info winbond
|
|
SPINAND_ECCINFO(&w25m02gv_ooblayout, NULL),
|
|
SPINAND_SELECT_TARGET(w25m02gv_select_target)),
|
|
SPINAND_INFO("W25N01GV",
|
|
- SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xaa),
|
|
+ SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xaa, 0x21),
|
|
NAND_MEMORG(1, 2048, 64, 64, 1024, 20, 1, 1, 1),
|
|
NAND_ECCREQ(1, 512),
|
|
SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
|