generic: 6.1: refresh pending patches

[openwrt/staging/ansuel.git] / target / linux / generic / pending-6.1 / 482-mtd-spi-nor-add-gd25q512.patch

diff --git a/target/linux/generic/pending-6.1/482-mtd-spi-nor-add-gd25q512.patch b/target/linux/generic/pending-6.1/482-mtd-spi-nor-add-gd25q512.patch
index 7c8b6862777814a1a5362a27c5f7e5756a9c4c1e..614263f190b17f3ce43b61d9fd85804fe9ff3487 100644 (file)
--- a/target/linux/generic/pending-6.1/482-mtd-spi-nor-add-gd25q512.patch
+++ b/target/linux/generic/pending-6.1/482-mtd-spi-nor-add-gd25q512.patch
@@ -9,13 +9,15 @@ Subject: [PATCH] spi-nor/gigadevic: add gd25q512
 
 --- a/drivers/mtd/spi-nor/gigadevice.c
 +++ b/drivers/mtd/spi-nor/gigadevice.c
-@@ -53,6 +53,9 @@ static const struct flash_info gigadevic
-                          SPI_NOR_4B_OPCODES | SPI_NOR_HAS_LOCK |
-                          SPI_NOR_HAS_TB | SPI_NOR_TB_SR_BIT6)
+@@ -53,6 +53,11 @@ static const struct flash_info gigadevic
+               FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB | SPI_NOR_TB_SR_BIT6)
+               FIXUP_FLAGS(SPI_NOR_4B_OPCODES)
                .fixups = &gd25q256_fixups },
-+      { "gd25q512", INFO(0xc84020, 0, 64 * 1024, 1024,
-+                         SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
-+                         SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB | SPI_NOR_4B_OPCODES) },
++      { "gd25q512", INFO(0xc84020, 0, 64 * 1024, 1024)
++              FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
++              FIXUP_FLAGS(SPI_NOR_4B_OPCODES)
++              NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ |
++                            SPI_NOR_QUAD_READ) },
  };
  
  const struct spi_nor_manufacturer spi_nor_gigadevice = {