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/ipq40xx/patches-4.14/303-spi-nor-enable-4B-opcodes-for-mx25l25635f.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/ipq40xx/patches-4.14/303-spi-nor-enable-4B-opcodes-for-mx25l25635f.patch')
| -rw-r--r-- | target/linux/ipq40xx/patches-4.14/303-spi-nor-enable-4B-opcodes-for-mx25l25635f.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/ipq40xx/patches-4.14/303-spi-nor-enable-4B-opcodes-for-mx25l25635f.patch b/target/linux/ipq40xx/patches-4.14/303-spi-nor-enable-4B-opcodes-for-mx25l25635f.patch index 056361eb46..28a04fae6d 100644 --- a/target/linux/ipq40xx/patches-4.14/303-spi-nor-enable-4B-opcodes-for-mx25l25635f.patch +++ b/target/linux/ipq40xx/patches-4.14/303-spi-nor-enable-4B-opcodes-for-mx25l25635f.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -1031,6 +1031,7 @@ static const struct flash_info spi_nor_i +@@ -1032,6 +1032,7 @@ static const struct flash_info spi_nor_i { "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) }, { "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) }, { "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, @@ -8,7 +8,7 @@ { "mx25u25635f", INFO(0xc22539, 0, 64 * 1024, 512, SECT_4K | SPI_NOR_4B_OPCODES) }, { "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) }, { "mx66l51235l", INFO(0xc2201a, 0, 64 * 1024, 1024, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, -@@ -1200,11 +1201,12 @@ static const struct flash_info spi_nor_i +@@ -1201,11 +1202,12 @@ static const struct flash_info spi_nor_i { }, }; @@ -23,7 +23,7 @@ tmp = nor->read_reg(nor, SPINOR_OP_RDID, id, SPI_NOR_MAX_ID_LEN); if (tmp < 0) { -@@ -1215,10 +1217,16 @@ static const struct flash_info *spi_nor_ +@@ -1216,10 +1218,16 @@ static const struct flash_info *spi_nor_ for (tmp = 0; tmp < ARRAY_SIZE(spi_nor_ids) - 1; tmp++) { info = &spi_nor_ids[tmp]; if (info->id_len) { @@ -42,7 +42,7 @@ dev_err(nor->dev, "unrecognized JEDEC id bytes: %02x, %02x, %02x\n", id[0], id[1], id[2]); return ERR_PTR(-ENODEV); -@@ -2678,7 +2686,7 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -2679,7 +2687,7 @@ int spi_nor_scan(struct spi_nor *nor, co info = spi_nor_match_id(name); /* Try to auto-detect if chip name wasn't specified or not found */ if (!info) @@ -51,7 +51,7 @@ if (IS_ERR_OR_NULL(info)) return -ENOENT; -@@ -2689,7 +2697,7 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -2690,7 +2698,7 @@ int spi_nor_scan(struct spi_nor *nor, co if (name && info->id_len) { const struct flash_info *jinfo; |