From 39e8ab17d55094709e103da28360f0cc515612a9 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 23 Jul 2017 14:25:40 +0200 Subject: kernel: update kernel 4.4 to version 4.4.79 Signed-off-by: Hauke Mehrtens --- .../patches-4.4/1074-mtd-nand-spi-nor-assign-MTD-of_node.patch | 2 +- ...5-mtd-spi-nor-convert-to-spi_nor_-get-set-_flash_node.patch | 2 +- .../patches-4.4/1078-mtd-spi-nor-drop-flash_node-field.patch | 2 +- ...-mtd-spi-nor-provide-default-erase_sector-implementat.patch | 4 ++-- .../1090-mtd-spi-nor-Add-SPI-NOR-layer-PM-support.patch | 6 +++--- .../1100-mtd-spi_nor-Disable-Micron-flash-HW-protection.patch | 2 +- ...1103-mtd-spi-nor-Support-R-W-for-S25FS-S-family-flash.patch | 2 +- .../1105-mtd-spi-nor-add-DDR-quad-read-support.patch | 10 +++++----- ...10-mtd-spi-nor-fsl-quad-add-flash-S25FS-extra-support.patch | 2 +- .../patches-4.4/7018-devres-add-devm_alloc_percpu.patch | 2 +- .../8138-pci-layerscape-add-MSI-interrupt-support.patch | 2 +- 11 files changed, 18 insertions(+), 18 deletions(-) (limited to 'target/linux/layerscape') diff --git a/target/linux/layerscape/patches-4.4/1074-mtd-nand-spi-nor-assign-MTD-of_node.patch b/target/linux/layerscape/patches-4.4/1074-mtd-nand-spi-nor-assign-MTD-of_node.patch index e383347895..358b51245f 100644 --- a/target/linux/layerscape/patches-4.4/1074-mtd-nand-spi-nor-assign-MTD-of_node.patch +++ b/target/linux/layerscape/patches-4.4/1074-mtd-nand-spi-nor-assign-MTD-of_node.patch @@ -21,7 +21,7 @@ Signed-off-by: Yuan Yao --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -1221,6 +1221,7 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -1228,6 +1228,7 @@ int spi_nor_scan(struct spi_nor *nor, co mtd->flags |= MTD_NO_ERASE; mtd->dev.parent = dev; diff --git a/target/linux/layerscape/patches-4.4/1075-mtd-spi-nor-convert-to-spi_nor_-get-set-_flash_node.patch b/target/linux/layerscape/patches-4.4/1075-mtd-spi-nor-convert-to-spi_nor_-get-set-_flash_node.patch index 596cc6fcb7..bbe29b612a 100644 --- a/target/linux/layerscape/patches-4.4/1075-mtd-spi-nor-convert-to-spi_nor_-get-set-_flash_node.patch +++ b/target/linux/layerscape/patches-4.4/1075-mtd-spi-nor-convert-to-spi_nor_-get-set-_flash_node.patch @@ -69,7 +69,7 @@ Reviewed-by: Boris Brezillon spifi->nor.write = nxp_spifi_write; --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -1113,7 +1113,7 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -1120,7 +1120,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; diff --git a/target/linux/layerscape/patches-4.4/1078-mtd-spi-nor-drop-flash_node-field.patch b/target/linux/layerscape/patches-4.4/1078-mtd-spi-nor-drop-flash_node-field.patch index 45c69a85cd..dc551dfabb 100644 --- a/target/linux/layerscape/patches-4.4/1078-mtd-spi-nor-drop-flash_node-field.patch +++ b/target/linux/layerscape/patches-4.4/1078-mtd-spi-nor-drop-flash_node-field.patch @@ -14,7 +14,7 @@ Reviewed-by: Boris Brezillon --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -1221,7 +1221,6 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -1228,7 +1228,6 @@ int spi_nor_scan(struct spi_nor *nor, co mtd->flags |= MTD_NO_ERASE; mtd->dev.parent = dev; diff --git a/target/linux/layerscape/patches-4.4/1081-mtd-spi-nor-provide-default-erase_sector-implementat.patch b/target/linux/layerscape/patches-4.4/1081-mtd-spi-nor-provide-default-erase_sector-implementat.patch index c5029b87a2..e966cafce6 100644 --- a/target/linux/layerscape/patches-4.4/1081-mtd-spi-nor-provide-default-erase_sector-implementat.patch +++ b/target/linux/layerscape/patches-4.4/1081-mtd-spi-nor-provide-default-erase_sector-implementat.patch @@ -69,7 +69,7 @@ Signed-off-by: Brian Norris addr += mtd->erasesize; len -= mtd->erasesize; -@@ -1100,7 +1123,7 @@ static int set_quad_mode(struct spi_nor +@@ -1107,7 +1130,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 || @@ -78,7 +78,7 @@ Signed-off-by: Brian Norris pr_err("spi-nor: please fill all the necessary fields!\n"); return -EINVAL; } -@@ -1303,6 +1326,12 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -1310,6 +1333,12 @@ int spi_nor_scan(struct spi_nor *nor, co nor->addr_width = 3; } diff --git a/target/linux/layerscape/patches-4.4/1090-mtd-spi-nor-Add-SPI-NOR-layer-PM-support.patch b/target/linux/layerscape/patches-4.4/1090-mtd-spi-nor-Add-SPI-NOR-layer-PM-support.patch index 65a6633453..de3d2d5456 100644 --- a/target/linux/layerscape/patches-4.4/1090-mtd-spi-nor-Add-SPI-NOR-layer-PM-support.patch +++ b/target/linux/layerscape/patches-4.4/1090-mtd-spi-nor-Add-SPI-NOR-layer-PM-support.patch @@ -24,7 +24,7 @@ Integrated-by: Jiang Yutang --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -1141,6 +1141,26 @@ static int spi_nor_check(struct spi_nor +@@ -1148,6 +1148,26 @@ static int spi_nor_check(struct spi_nor return 0; } @@ -51,7 +51,7 @@ Integrated-by: Jiang Yutang int spi_nor_scan(struct spi_nor *nor, const char *name, enum read_mode mode) { const struct flash_info *info = NULL; -@@ -1188,19 +1208,9 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -1195,19 +1215,9 @@ int spi_nor_scan(struct spi_nor *nor, co mutex_init(&nor->lock); @@ -74,7 +74,7 @@ Integrated-by: Jiang Yutang if (!mtd->name) mtd->name = dev_name(dev); -@@ -1367,6 +1377,45 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -1374,6 +1384,45 @@ int spi_nor_scan(struct spi_nor *nor, co } EXPORT_SYMBOL_GPL(spi_nor_scan); diff --git a/target/linux/layerscape/patches-4.4/1100-mtd-spi_nor-Disable-Micron-flash-HW-protection.patch b/target/linux/layerscape/patches-4.4/1100-mtd-spi_nor-Disable-Micron-flash-HW-protection.patch index a5495616e9..47fef5cd0c 100644 --- a/target/linux/layerscape/patches-4.4/1100-mtd-spi_nor-Disable-Micron-flash-HW-protection.patch +++ b/target/linux/layerscape/patches-4.4/1100-mtd-spi_nor-Disable-Micron-flash-HW-protection.patch @@ -24,7 +24,7 @@ Signed-off-by: Yunhui Cui struct flash_info { char *name; -@@ -1239,6 +1240,14 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -1246,6 +1247,14 @@ int spi_nor_scan(struct spi_nor *nor, co if (ret) return ret; diff --git a/target/linux/layerscape/patches-4.4/1103-mtd-spi-nor-Support-R-W-for-S25FS-S-family-flash.patch b/target/linux/layerscape/patches-4.4/1103-mtd-spi-nor-Support-R-W-for-S25FS-S-family-flash.patch index 9cfa2697a8..7b954dd5c8 100644 --- a/target/linux/layerscape/patches-4.4/1103-mtd-spi-nor-Support-R-W-for-S25FS-S-family-flash.patch +++ b/target/linux/layerscape/patches-4.4/1103-mtd-spi-nor-Support-R-W-for-S25FS-S-family-flash.patch @@ -95,7 +95,7 @@ Signed-off-by: Yunhui Cui static int spi_nor_read(struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf) { -@@ -1248,6 +1302,12 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -1255,6 +1309,12 @@ int spi_nor_scan(struct spi_nor *nor, co write_sr(nor, ret); } diff --git a/target/linux/layerscape/patches-4.4/1105-mtd-spi-nor-add-DDR-quad-read-support.patch b/target/linux/layerscape/patches-4.4/1105-mtd-spi-nor-add-DDR-quad-read-support.patch index bad120e7be..df7e0d82f8 100644 --- a/target/linux/layerscape/patches-4.4/1105-mtd-spi-nor-add-DDR-quad-read-support.patch +++ b/target/linux/layerscape/patches-4.4/1105-mtd-spi-nor-add-DDR-quad-read-support.patch @@ -63,7 +63,7 @@ Signed-off-by: Yunhui Cui { "s25fl129p0", INFO(0x012018, 0x4d00, 256 * 1024, 64, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, { "s25fl129p1", INFO(0x012018, 0x4d01, 64 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, { "s25sl004a", INFO(0x010212, 0, 64 * 1024, 8, 0) }, -@@ -1188,6 +1194,23 @@ static int spansion_quad_enable(struct s +@@ -1195,6 +1201,23 @@ static int spansion_quad_enable(struct s return 0; } @@ -87,7 +87,7 @@ Signed-off-by: Yunhui Cui static int set_quad_mode(struct spi_nor *nor, const struct flash_info *info) { int status; -@@ -1378,8 +1401,15 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -1385,8 +1408,15 @@ int spi_nor_scan(struct spi_nor *nor, co if (info->flags & SPI_NOR_NO_FR) nor->flash_read = SPI_NOR_NORMAL; @@ -105,7 +105,7 @@ Signed-off-by: Yunhui Cui ret = set_quad_mode(nor, info); if (ret) { dev_err(dev, "quad mode not supported\n"); -@@ -1392,6 +1422,14 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -1399,6 +1429,14 @@ int spi_nor_scan(struct spi_nor *nor, co /* Default commands */ switch (nor->flash_read) { @@ -120,7 +120,7 @@ Signed-off-by: Yunhui Cui case SPI_NOR_QUAD: nor->read_opcode = SPINOR_OP_READ_1_1_4; break; -@@ -1419,6 +1457,9 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -1426,6 +1464,9 @@ int spi_nor_scan(struct spi_nor *nor, co if (JEDEC_MFR(info) == SNOR_MFR_SPANSION) { /* Dedicated 4-byte command set */ switch (nor->flash_read) { @@ -130,7 +130,7 @@ Signed-off-by: Yunhui Cui case SPI_NOR_QUAD: nor->read_opcode = SPINOR_OP_READ4_1_1_4; break; -@@ -1448,7 +1489,7 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -1455,7 +1496,7 @@ int spi_nor_scan(struct spi_nor *nor, co return -EINVAL; } diff --git a/target/linux/layerscape/patches-4.4/1110-mtd-spi-nor-fsl-quad-add-flash-S25FS-extra-support.patch b/target/linux/layerscape/patches-4.4/1110-mtd-spi-nor-fsl-quad-add-flash-S25FS-extra-support.patch index 8dab548550..c018a33fb0 100644 --- a/target/linux/layerscape/patches-4.4/1110-mtd-spi-nor-fsl-quad-add-flash-S25FS-extra-support.patch +++ b/target/linux/layerscape/patches-4.4/1110-mtd-spi-nor-fsl-quad-add-flash-S25FS-extra-support.patch @@ -136,7 +136,7 @@ Integrated-by: Jiang Yutang return 0; } -@@ -1336,6 +1333,8 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -1343,6 +1340,8 @@ int spi_nor_scan(struct spi_nor *nor, co if (!mtd->name) mtd->name = dev_name(dev); diff --git a/target/linux/layerscape/patches-4.4/7018-devres-add-devm_alloc_percpu.patch b/target/linux/layerscape/patches-4.4/7018-devres-add-devm_alloc_percpu.patch index 4962d4bada..835403e582 100644 --- a/target/linux/layerscape/patches-4.4/7018-devres-add-devm_alloc_percpu.patch +++ b/target/linux/layerscape/patches-4.4/7018-devres-add-devm_alloc_percpu.patch @@ -110,7 +110,7 @@ Conflicts: +EXPORT_SYMBOL_GPL(devm_free_percpu); --- a/include/linux/device.h +++ b/include/linux/device.h -@@ -681,6 +681,25 @@ void __iomem *devm_ioremap_resource(stru +@@ -683,6 +683,25 @@ void __iomem *devm_ioremap_resource(stru int devm_add_action(struct device *dev, void (*action)(void *), void *data); void devm_remove_action(struct device *dev, void (*action)(void *), void *data); diff --git a/target/linux/layerscape/patches-4.4/8138-pci-layerscape-add-MSI-interrupt-support.patch b/target/linux/layerscape/patches-4.4/8138-pci-layerscape-add-MSI-interrupt-support.patch index 0db0a6b6d3..cbfa86c1e2 100644 --- a/target/linux/layerscape/patches-4.4/8138-pci-layerscape-add-MSI-interrupt-support.patch +++ b/target/linux/layerscape/patches-4.4/8138-pci-layerscape-add-MSI-interrupt-support.patch @@ -69,7 +69,7 @@ Signed-off-by: Zhao Qiang if (IS_ERR(group)) --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c -@@ -686,10 +686,10 @@ static struct iommu_group *get_pci_alias +@@ -697,10 +697,10 @@ static struct iommu_group *get_pci_alias continue; /* We alias them or they alias us */ -- cgit v1.2.3