diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-11-14 13:53:03 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-11-14 16:27:43 +0100 |
| commit | 7e20e4ab96ffc4d425fc3c6593a65d813f641fd1 (patch) | |
| tree | e5a8922efcd5dbceda05164f7736e2d89f6aeb49 /target/linux/generic/pending-4.9/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch | |
| parent | f7a406deafb4d2524f46a405d84a6d20c65022a9 (diff) | |
| download | upstream-7e20e4ab96ffc4d425fc3c6593a65d813f641fd1.tar.gz upstream-7e20e4ab96ffc4d425fc3c6593a65d813f641fd1.tar.bz2 upstream-7e20e4ab96ffc4d425fc3c6593a65d813f641fd1.zip | |
kernel: bump 4.9 to 4.9.137
Refreshed all patches.
Removed upstreamed hunks in:
- 703-phy-support-layerscape.patch
Compile-tested on: ar71xx, layerscape
Runtime-tested on: ar71xx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/pending-4.9/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch')
| -rw-r--r-- | target/linux/generic/pending-4.9/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-4.9/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch b/target/linux/generic/pending-4.9/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch index e032b08f4d..e1681d61dd 100644 --- a/target/linux/generic/pending-4.9/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch +++ b/target/linux/generic/pending-4.9/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch @@ -17,7 +17,7 @@ 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 -@@ -1597,6 +1597,7 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -1603,6 +1603,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 || @@ -25,7 +25,7 @@ Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net> info->flags & SPI_NOR_HAS_LOCK) { write_enable(nor); write_sr(nor, 0); -@@ -1615,7 +1616,8 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -1621,7 +1622,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 || |