ath79: fix incorrect identation in qca9557.dtsi

[oweals/openwrt.git] / target / linux / generic / pending-4.19 / 466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch

diff --git a/target/linux/generic/pending-4.19/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch b/target/linux/generic/pending-4.19/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch
index 55d9709761c7c6d3e2bb722256db9e3f18871f17..fb6ae7df7b307f2ce7ff1ce6f7ecca1be6c0d3e5 100644 (file)
--- a/target/linux/generic/pending-4.19/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch
+++ b/target/linux/generic/pending-4.19/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch
@@ -17,15 +17,15 @@ Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
 
 --- a/drivers/mtd/spi-nor/spi-nor.c
 +++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -2716,6 +2716,7 @@ int spi_nor_scan(struct spi_nor *nor, co
-           JEDEC_MFR(info) == SNOR_MFR_INTEL ||
-           JEDEC_MFR(info) == SNOR_MFR_MACRONIX ||
-           JEDEC_MFR(info) == SNOR_MFR_SST ||
-+          JEDEC_MFR(info) == SNOR_MFR_WINBOND ||
-           info->flags & SPI_NOR_HAS_LOCK) {
+@@ -2737,6 +2737,7 @@ static int spi_nor_init(struct spi_nor *
+           JEDEC_MFR(nor->info) == SNOR_MFR_INTEL ||
+           JEDEC_MFR(nor->info) == SNOR_MFR_MACRONIX ||
+           JEDEC_MFR(nor->info) == SNOR_MFR_SST ||
++          JEDEC_MFR(nor->info) == SNOR_MFR_WINBOND ||
+           nor->info->flags & SPI_NOR_HAS_LOCK) {
                write_enable(nor);
                write_sr(nor, 0);
-@@ -2734,7 +2735,8 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -2873,7 +2874,8 @@ int spi_nor_scan(struct spi_nor *nor, co
  
        /* NOR protection support for STmicro/Micron chips and similar */
        if (JEDEC_MFR(info) == SNOR_MFR_MICRON ||