generic: 6.1: replace ipq40xx MDIO patch with upstream version

[openwrt/openwrt.git] / target / linux / generic / pending-6.1 / 484-mtd-spi-nor-add-esmt-f25l16pa.patch

diff --git a/target/linux/generic/pending-6.1/484-mtd-spi-nor-add-esmt-f25l16pa.patch b/target/linux/generic/pending-6.1/484-mtd-spi-nor-add-esmt-f25l16pa.patch
index ab402e622a20f538d6c14f55b8ee96be738b36b1..d5ebe20309737601278a02e9a88b44ad7e5e1115 100644 (file)
--- a/target/linux/generic/pending-6.1/484-mtd-spi-nor-add-esmt-f25l16pa.patch
+++ b/target/linux/generic/pending-6.1/484-mtd-spi-nor-add-esmt-f25l16pa.patch
@@ -12,12 +12,13 @@ flash.
 
 --- a/drivers/mtd/spi-nor/esmt.c
 +++ b/drivers/mtd/spi-nor/esmt.c
-@@ -10,6 +10,8 @@
+@@ -10,6 +10,9 @@
  
- static const struct flash_info esmt_parts[] = {
+ static const struct flash_info esmt_nor_parts[] = {
        /* ESMT */
-+      { "f25l16pa-2s", INFO(0x8c2115, 0, 64 * 1024, 32,
-+                         SECT_4K | SPI_NOR_HAS_LOCK) },
-       { "f25l32pa", INFO(0x8c2016, 0, 64 * 1024, 64,
-                          SECT_4K | SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE) },
-       { "f25l32qa", INFO(0x8c4116, 0, 64 * 1024, 64,
++      { "f25l16pa-2s", INFO(0x8c2115, 0, 64 * 1024, 32)
++                      FLAGS(SPI_NOR_HAS_LOCK)
++                      NO_SFDP_FLAGS(SECT_4K) },
+       { "f25l32pa", INFO(0x8c2016, 0, 64 * 1024, 64)
+               FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE)
+               NO_SFDP_FLAGS(SECT_4K) },