generic: 6.6: manually refresh pending patches

[openwrt/openwrt.git] / target / linux / generic / pending-6.6 / 465-m25p80-mx-disable-software-protection.patch

diff --git a/target/linux/generic/pending-6.6/465-m25p80-mx-disable-software-protection.patch b/target/linux/generic/pending-6.6/465-m25p80-mx-disable-software-protection.patch
index 1e280773381cc19979dba263215b2c15b582bc56..0bed77b3b59069c6d43205b6439d52ae10068b76 100644 (file)
--- a/target/linux/generic/pending-6.6/465-m25p80-mx-disable-software-protection.patch
+++ b/target/linux/generic/pending-6.6/465-m25p80-mx-disable-software-protection.patch
@@ -8,11 +8,11 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/drivers/mtd/spi-nor/macronix.c
 +++ b/drivers/mtd/spi-nor/macronix.c
-@@ -106,6 +106,7 @@ static void macronix_nor_default_init(st
+@@ -115,6 +115,7 @@ static void macronix_nor_default_init(st
  {
-       nor->params->quad_enable = spi_nor_sr1_bit6_quad_enable;
-       nor->params->set_4byte_addr_mode = spi_nor_set_4byte_addr_mode;
+       if (!nor->params->set_4byte_addr_mode)
+               nor->params->set_4byte_addr_mode = spi_nor_set_4byte_addr_mode_en4b_ex4b;
 +      nor->flags |= SNOR_F_HAS_LOCK;
- }
  
- static const struct spi_nor_fixups macronix_nor_fixups = {
+       return 0;
+ }