From 8072264b96785184b76aa46bcd08b4f9cdfada42 Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Mon, 22 Aug 2016 19:05:45 +0200 Subject: kernel: update kernel 4.4 to version 4.4.19 Refresh patches for all targets that support kernel 4.4. Compile-tested on all targets that use kernel 4.4 and aren't marked broken. Runtime-tested on ar71xx, octeon and x86/64. Signed-off-by: Stijn Tintel --- ...mtd-backport-v4.7-0day-patches-from-Boris.patch | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'target/linux/mediatek') diff --git a/target/linux/mediatek/patches-4.4/0072-mtd-backport-v4.7-0day-patches-from-Boris.patch b/target/linux/mediatek/patches-4.4/0072-mtd-backport-v4.7-0day-patches-from-Boris.patch index 7e7a5de1c8..8ad59dfb33 100644 --- a/target/linux/mediatek/patches-4.4/0072-mtd-backport-v4.7-0day-patches-from-Boris.patch +++ b/target/linux/mediatek/patches-4.4/0072-mtd-backport-v4.7-0day-patches-from-Boris.patch @@ -4296,7 +4296,7 @@ Signed-off-by: John Crispin } /* -@@ -715,9 +848,9 @@ static const struct flash_info spi_nor_i +@@ -716,9 +849,9 @@ static const struct flash_info spi_nor_i { "mx25l4005a", INFO(0xc22013, 0, 64 * 1024, 8, SECT_4K) }, { "mx25l8005", INFO(0xc22014, 0, 64 * 1024, 16, 0) }, { "mx25l1606e", INFO(0xc22015, 0, 64 * 1024, 32, SECT_4K) }, @@ -4308,7 +4308,7 @@ Signed-off-by: John Crispin { "mx25u6435f", INFO(0xc22537, 0, 64 * 1024, 128, SECT_4K) }, { "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) }, { "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) }, -@@ -732,8 +865,8 @@ static const struct flash_info spi_nor_i +@@ -733,8 +866,8 @@ static const struct flash_info spi_nor_i { "n25q032a", INFO(0x20bb16, 0, 64 * 1024, 64, SPI_NOR_QUAD_READ) }, { "n25q064", INFO(0x20ba17, 0, 64 * 1024, 128, SECT_4K | SPI_NOR_QUAD_READ) }, { "n25q064a", INFO(0x20bb17, 0, 64 * 1024, 128, SECT_4K | SPI_NOR_QUAD_READ) }, @@ -4319,7 +4319,7 @@ Signed-off-by: John Crispin { "n25q256a", INFO(0x20ba19, 0, 64 * 1024, 512, SECT_4K | SPI_NOR_QUAD_READ) }, { "n25q512a", INFO(0x20bb20, 0, 64 * 1024, 1024, SECT_4K | USE_FSR | SPI_NOR_QUAD_READ) }, { "n25q512ax3", INFO(0x20ba20, 0, 64 * 1024, 1024, SECT_4K | USE_FSR | SPI_NOR_QUAD_READ) }, -@@ -767,6 +900,7 @@ static const struct flash_info spi_nor_i +@@ -768,6 +901,7 @@ static const struct flash_info spi_nor_i { "s25fl008k", INFO(0xef4014, 0, 64 * 1024, 16, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, { "s25fl016k", INFO(0xef4015, 0, 64 * 1024, 32, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, { "s25fl064k", INFO(0xef4017, 0, 64 * 1024, 128, SECT_4K) }, @@ -4327,7 +4327,7 @@ Signed-off-by: John Crispin { "s25fl132k", INFO(0x014016, 0, 64 * 1024, 64, SECT_4K) }, { "s25fl164k", INFO(0x014017, 0, 64 * 1024, 128, SECT_4K) }, { "s25fl204k", INFO(0x014013, 0, 64 * 1024, 8, SECT_4K | SPI_NOR_DUAL_READ) }, -@@ -830,11 +964,23 @@ static const struct flash_info spi_nor_i +@@ -831,11 +965,23 @@ static const struct flash_info spi_nor_i { "w25x16", INFO(0xef3015, 0, 64 * 1024, 32, SECT_4K) }, { "w25x32", INFO(0xef3016, 0, 64 * 1024, 64, SECT_4K) }, { "w25q32", INFO(0xef4016, 0, 64 * 1024, 64, SECT_4K) }, @@ -4354,7 +4354,7 @@ Signed-off-by: John Crispin { "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) }, -@@ -857,7 +1003,7 @@ static const struct flash_info *spi_nor_ +@@ -858,7 +1004,7 @@ static const struct flash_info *spi_nor_ tmp = nor->read_reg(nor, SPINOR_OP_RDID, id, SPI_NOR_MAX_ID_LEN); if (tmp < 0) { @@ -4363,7 +4363,7 @@ Signed-off-by: John Crispin return ERR_PTR(tmp); } -@@ -868,7 +1014,7 @@ static const struct flash_info *spi_nor_ +@@ -869,7 +1015,7 @@ static const struct flash_info *spi_nor_ return &spi_nor_ids[tmp]; } } @@ -4372,7 +4372,7 @@ Signed-off-by: John Crispin id[0], id[1], id[2]); return ERR_PTR(-ENODEV); } -@@ -1014,6 +1160,8 @@ static int macronix_quad_enable(struct s +@@ -1015,6 +1161,8 @@ static int macronix_quad_enable(struct s int ret, val; val = read_sr(nor); @@ -4381,7 +4381,7 @@ Signed-off-by: John Crispin write_enable(nor); write_sr(nor, val | SR_QUAD_EN_MX); -@@ -1095,7 +1243,7 @@ static int set_quad_mode(struct spi_nor +@@ -1096,7 +1244,7 @@ static int set_quad_mode(struct spi_nor static int spi_nor_check(struct spi_nor *nor) { if (!nor->dev || !nor->read || !nor->write || @@ -4390,7 +4390,7 @@ Signed-off-by: John Crispin pr_err("spi-nor: please fill all the necessary fields!\n"); return -EINVAL; } -@@ -1108,7 +1256,7 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -1109,7 +1257,7 @@ int spi_nor_scan(struct spi_nor *nor, co const struct flash_info *info = NULL; struct device *dev = nor->dev; struct mtd_info *mtd = &nor->mtd; @@ -4399,7 +4399,7 @@ Signed-off-by: John Crispin int ret; int i; -@@ -1158,9 +1306,11 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -1159,9 +1307,11 @@ int spi_nor_scan(struct spi_nor *nor, co if (JEDEC_MFR(info) == SNOR_MFR_ATMEL || JEDEC_MFR(info) == SNOR_MFR_INTEL || JEDEC_MFR(info) == SNOR_MFR_MACRONIX || @@ -4412,7 +4412,7 @@ Signed-off-by: John Crispin } if (!mtd->name) -@@ -1174,7 +1324,8 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -1175,7 +1325,8 @@ int spi_nor_scan(struct spi_nor *nor, co mtd->_read = spi_nor_read; /* NOR protection support for STmicro/Micron chips and similar */ @@ -4422,7 +4422,7 @@ Signed-off-by: John Crispin nor->flash_lock = stm_lock; nor->flash_unlock = stm_unlock; nor->flash_is_locked = stm_is_locked; -@@ -1194,6 +1345,8 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -1195,6 +1346,8 @@ int spi_nor_scan(struct spi_nor *nor, co if (info->flags & USE_FSR) nor->flags |= SNOR_F_USE_FSR; @@ -4431,7 +4431,7 @@ Signed-off-by: John Crispin #ifdef CONFIG_MTD_SPI_NOR_USE_4K_SECTORS /* prefer "small sector" erase if possible */ -@@ -1296,6 +1449,12 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -1297,6 +1450,12 @@ int spi_nor_scan(struct spi_nor *nor, co nor->addr_width = 3; } -- cgit v1.2.3