diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-01-07 11:04:01 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-01-07 17:09:06 +0100 |
| commit | f56a4e809bd2737d92c666b8cfaa9d0887a5742f (patch) | |
| tree | c766ba26c310946d002589a22996d87f49182e18 /target/linux/ramips/patches-4.14/0053-mtd-spi-nor-add-w25q256-3b-mode-switch.patch | |
| parent | 30d518bf1674fc0836cbdcd5790ce9b70980ff60 (diff) | |
| download | upstream-f56a4e809bd2737d92c666b8cfaa9d0887a5742f.tar.gz upstream-f56a4e809bd2737d92c666b8cfaa9d0887a5742f.tar.bz2 upstream-f56a4e809bd2737d92c666b8cfaa9d0887a5742f.zip | |
kernel: bump 4.14 to 4.14.91
Refreshed all patches.
Removed upstreamed:
- 500-ubifs-Handle-re-linking-of-inodes-correctly-while-re.patch
Compile-tested on: ar71xx, cns3xxx, imx6
Runtime-tested on: ar71xx, cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/ramips/patches-4.14/0053-mtd-spi-nor-add-w25q256-3b-mode-switch.patch')
| -rw-r--r-- | target/linux/ramips/patches-4.14/0053-mtd-spi-nor-add-w25q256-3b-mode-switch.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/ramips/patches-4.14/0053-mtd-spi-nor-add-w25q256-3b-mode-switch.patch b/target/linux/ramips/patches-4.14/0053-mtd-spi-nor-add-w25q256-3b-mode-switch.patch index 9a18e515ae..8631f5d720 100644 --- a/target/linux/ramips/patches-4.14/0053-mtd-spi-nor-add-w25q256-3b-mode-switch.patch +++ b/target/linux/ramips/patches-4.14/0053-mtd-spi-nor-add-w25q256-3b-mode-switch.patch @@ -116,7 +116,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_LOCK); return ret; -@@ -1176,7 +1228,7 @@ static const struct flash_info spi_nor_i +@@ -1177,7 +1229,7 @@ static const struct flash_info spi_nor_i { "w25q80", INFO(0xef5014, 0, 64 * 1024, 16, SECT_4K) }, { "w25q80bl", INFO(0xef4014, 0, 64 * 1024, 16, SECT_4K) }, { "w25q128", INFO(0xef4018, 0, 64 * 1024, 256, SECT_4K) }, @@ -125,7 +125,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> { "w25m512jv", INFO(0xef7119, 0, 64 * 1024, 1024, SECT_4K | SPI_NOR_QUAD_READ | SPI_NOR_DUAL_READ) }, -@@ -1236,6 +1288,9 @@ static int spi_nor_read(struct mtd_info +@@ -1237,6 +1289,9 @@ static int spi_nor_read(struct mtd_info if (ret) return ret; @@ -135,7 +135,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> while (len) { loff_t addr = from; -@@ -1260,6 +1315,18 @@ static int spi_nor_read(struct mtd_info +@@ -1261,6 +1316,18 @@ static int spi_nor_read(struct mtd_info ret = 0; read_err: @@ -154,7 +154,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_READ); return ret; } -@@ -1361,6 +1428,10 @@ static int spi_nor_write(struct mtd_info +@@ -1362,6 +1429,10 @@ static int spi_nor_write(struct mtd_info if (ret) return ret; @@ -165,7 +165,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> for (i = 0; i < len; ) { ssize_t written; loff_t addr = to + i; -@@ -1401,6 +1472,7 @@ static int spi_nor_write(struct mtd_info +@@ -1402,6 +1473,7 @@ static int spi_nor_write(struct mtd_info } write_err: @@ -173,7 +173,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_WRITE); return ret; } -@@ -2817,8 +2889,10 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -2818,8 +2890,10 @@ 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; |