|
| 1 | +From 29922c1e20e86e643687a76b8c3181e388067b03 Mon Sep 17 00:00:00 2001 |
| 2 | +From: Vivek Reddy <vkarri@nvidia.com> |
| 3 | +Date: Fri, 27 Sep 2024 02:27:37 +0000 |
| 4 | +Subject: [PATCH] Revert "mtd: spi-nor: Correct flags for Winbond w25q128" |
| 5 | + |
| 6 | +This reverts commit 7c6ba20a0b9aeb82a6c097c74ccbecdda8e9fc25. |
| 7 | +--- |
| 8 | + drivers/mtd/spi-nor/winbond.c | 5 ++--- |
| 9 | + 1 file changed, 2 insertions(+), 3 deletions(-) |
| 10 | + |
| 11 | +diff --git a/drivers/mtd/spi-nor/winbond.c b/drivers/mtd/spi-nor/winbond.c |
| 12 | +index b7c775b615e8..ffaa24055259 100644 |
| 13 | +--- a/drivers/mtd/spi-nor/winbond.c |
| 14 | ++++ b/drivers/mtd/spi-nor/winbond.c |
| 15 | +@@ -120,9 +120,8 @@ static const struct flash_info winbond_nor_parts[] = { |
| 16 | + NO_SFDP_FLAGS(SECT_4K) }, |
| 17 | + { "w25q80bl", INFO(0xef4014, 0, 64 * 1024, 16) |
| 18 | + NO_SFDP_FLAGS(SECT_4K) }, |
| 19 | +- { "w25q128", INFO(0xef4018, 0, 0, 0) |
| 20 | +- PARSE_SFDP |
| 21 | +- FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) }, |
| 22 | ++ { "w25q128", INFO(0xef4018, 0, 64 * 1024, 256) |
| 23 | ++ NO_SFDP_FLAGS(SECT_4K) }, |
| 24 | + { "w25q256", INFO(0xef4019, 0, 64 * 1024, 512) |
| 25 | + NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) |
| 26 | + .fixups = &w25q256_fixups }, |
| 27 | +-- |
| 28 | +2.43.2 |
| 29 | + |
0 commit comments