aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-12-18 14:12:50 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-12-18 15:12:06 +0100
commit7b0e1d28e89e8932aa228ff2f37c274745eaa5e8 (patch)
treedfaded69f238608d359af5737be5bb5a817d0ff1 /target/linux/ramips
parent386a57dc596c95919024e0726582a996d801d9fb (diff)
downloadupstream-7b0e1d28e89e8932aa228ff2f37c274745eaa5e8.tar.gz
upstream-7b0e1d28e89e8932aa228ff2f37c274745eaa5e8.tar.bz2
upstream-7b0e1d28e89e8932aa228ff2f37c274745eaa5e8.zip
kernel: bump 4.14 to 4.14.89
Refreshed all patches. Compile-tested on: cns3xxx, imx6 Runtime-tested on: cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/ramips')
-rw-r--r--target/linux/ramips/patches-4.14/0054-mtd-spi-nor-w25q256-respect-default-mode.patch2
-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
3 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/ramips/patches-4.14/0054-mtd-spi-nor-w25q256-respect-default-mode.patch b/target/linux/ramips/patches-4.14/0054-mtd-spi-nor-w25q256-respect-default-mode.patch
index 568d61db91..6bce3194f2 100644
--- a/target/linux/ramips/patches-4.14/0054-mtd-spi-nor-w25q256-respect-default-mode.patch
+++ b/target/linux/ramips/patches-4.14/0054-mtd-spi-nor-w25q256-respect-default-mode.patch
@@ -33,7 +33,7 @@
/*
* Write status register 1 byte
* Returns negative if error occurred.
-@@ -2878,9 +2887,16 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -2888,9 +2897,16 @@ int spi_nor_scan(struct spi_nor *nor, co
} else if (mtd->size > 0x1000000) {
/* enable 4-byte addressing if the device exceeds 16MiB */
nor->addr_width = 4;
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 408fc13e7a..e5c39db68f 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
-@@ -1050,6 +1050,11 @@ static const struct flash_info spi_nor_i
+@@ -1059,6 +1059,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 d959ddb097..95993fe74c 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
-@@ -1089,7 +1089,7 @@ static const struct flash_info spi_nor_i
+@@ -1098,7 +1098,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) },