aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-06-14 16:33:48 +0200
committerJohn Crispin <john@phrozen.org>2018-06-18 07:10:19 +0200
commit2b9885571b7a711ccf759f2a0bfb778c36b72513 (patch)
treea7ae7e95cb6e3401a1322468c5f87e84d0a09cab /target/linux/ramips
parent8c1f088521e416ee9d71a21c969e6aa4cfdeafd7 (diff)
downloadupstream-2b9885571b7a711ccf759f2a0bfb778c36b72513.tar.gz
upstream-2b9885571b7a711ccf759f2a0bfb778c36b72513.tar.bz2
upstream-2b9885571b7a711ccf759f2a0bfb778c36b72513.zip
kernel: bump 4.14 to 4.14.49
Refreshed all patches Compile-tested on: cns3xxx, imx6, x86-64 Runtime-tested on: cns3xxx, imx6, x86-64 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/ramips')
-rw-r--r--target/linux/ramips/patches-4.14/302-spi-nor-add-gd25q512.patch2
-rw-r--r--target/linux/ramips/patches-4.14/303-spi-nor-enable-4B-opcodes-for-mx66l51235l.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ramips/patches-4.14/302-spi-nor-add-gd25q512.patch b/target/linux/ramips/patches-4.14/302-spi-nor-add-gd25q512.patch
index 93c7e928b7..7a42c78a4c 100644
--- a/target/linux/ramips/patches-4.14/302-spi-nor-add-gd25q512.patch
+++ b/target/linux/ramips/patches-4.14/302-spi-nor-add-gd25q512.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1051,6 +1051,11 @@ static const struct flash_info spi_nor_i
+@@ -1060,6 +1060,11 @@ static const struct flash_info spi_nor_i
SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
},
diff --git a/target/linux/ramips/patches-4.14/303-spi-nor-enable-4B-opcodes-for-mx66l51235l.patch b/target/linux/ramips/patches-4.14/303-spi-nor-enable-4B-opcodes-for-mx66l51235l.patch
index d0e68df031..7b2b280d35 100644
--- a/target/linux/ramips/patches-4.14/303-spi-nor-enable-4B-opcodes-for-mx66l51235l.patch
+++ b/target/linux/ramips/patches-4.14/303-spi-nor-enable-4B-opcodes-for-mx66l51235l.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1084,7 +1084,7 @@ static const struct flash_info spi_nor_i
+@@ -1093,7 +1093,7 @@ static const struct flash_info spi_nor_i
{ "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
{ "mx25u25635f", INFO(0xc22539, 0, 64 * 1024, 512, SECT_4K | SPI_NOR_4B_OPCODES) },
{ "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) },