- Refreshed all patches
- Removed upstreamed
Compile tested on: cns3xxx, imx6
Run tested on: cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandepu...@ncentric.com>
---
include/kernel-version.mk | 4 +-
...y-Initialize-mdio-clock-at-probe-function.patch | 48 ----------------------
...cm2835-Load-driver-early-and-support-lega.patch | 8 ++--
...e-bcm2835-Fix-cyclic-DMA-period-splitting.patch | 39 ------------------
...0002-mtd-spi-nor-fix-spansion-quad-enable.patch | 4 +-
...-nor-Add-support-for-S3AN-spi-nor-devices.patch | 6 +--
...-rename-SPINOR_OP_-macros-of-the-4-byte-a.patch | 2 +-
...-add-a-stateless-method-to-support-memory.patch | 2 +-
...k-to-of_scan_flat_dt-before-accessing-ini.patch | 30 --------------
...465-m25p80-mx-disable-software-protection.patch | 2 +-
.../0093-spi-double-time-out-tolerance.patch | 37 -----------------
...-marvell-88E1512-add-flow-control-support.patch | 2 +-
...-marvell-88E1111-add-flow-control-support.patch | 2 +-
...-marvell-88E1540-add-flow-control-support.patch | 2 +-
...35-net-phy-fix-marvell-phy-status-reading.patch | 26 ------------
...mtd-nor-support-mtd-name-from-device-tree.patch | 4 +-
.../0054-mtd-add-chunked-read-io-to-m25p80.patch | 4 +-
17 files changed, 21 insertions(+), 201 deletions(-)
delete mode 100644
target/linux/bcm53xx/patches-4.9/060-0001-net-phy-Initialize-mdio-clock-at-probe-function.patch
delete mode 100644
target/linux/brcm2708/patches-4.9/950-0187-dmaengine-bcm2835-Fix-cyclic-DMA-period-splitting.patch
delete mode 100644
target/linux/generic/patches-4.9/121-of-Add-check-to-of_scan_flat_dt-before-accessing-ini.patch
delete mode 100644
target/linux/lantiq/patches-4.9/0093-spi-double-time-out-tolerance.patch
delete mode 100644
target/linux/mvebu/patches-4.9/435-net-phy-fix-marvell-phy-status-reading.patch
diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index b9f76a2..f5bf1ea 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -4,11 +4,11 @@ LINUX_RELEASE?=1
LINUX_VERSION-3.18 = .43
LINUX_VERSION-4.4 = .74
-LINUX_VERSION-4.9 = .34
+LINUX_VERSION-4.9 = .35
LINUX_KERNEL_HASH-3.18.43 =
1236e8123a6ce537d5029232560966feed054ae31776fe8481dd7d18cdd5492c
LINUX_KERNEL_HASH-4.4.74 =
c319ad6150d112bd4f8c9d1427868eeafd3ab461becf9457f814e4ba7c57808e
-LINUX_KERNEL_HASH-4.9.34 =
13d159d1b1fa41ea19fcc2defe09d7532f312ee0b8279b8e12c961d8b02a4546
+LINUX_KERNEL_HASH-4.9.35 =
3491234ed79f3e4a425457edf96447773be677521932a3e5bafb79834c5e7436
ifdef KERNEL_PATCHVER
LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER)))
diff --git
a/target/linux/bcm53xx/patches-4.9/060-0001-net-phy-Initialize-mdio-clock-at-probe-function.patch
b/target/linux/bcm53xx/patches-4.9/060-0001-net-phy-Initialize-mdio-clock-at-probe-function.patch
deleted file mode 100644
index 7678a70..0000000
---
a/target/linux/bcm53xx/patches-4.9/060-0001-net-phy-Initialize-mdio-clock-at-probe-function.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From bb1a619735b4660f21bce3e728b937640024b4ad Mon Sep 17 00:00:00 2001
-From: Yendapally Reddy Dhananjaya Reddy <yendapally.re...@broadcom.com>
-Date: Wed, 8 Feb 2017 17:14:26 -0500
-Subject: [PATCH] net: phy: Initialize mdio clock at probe function
-
-USB PHYs need the MDIO clock divisor enabled earlier to work.
-Initialize mdio clock divisor in probe function. The ext bus
-bit available in the same register will be used by mdio mux
-to enable external mdio.
-
-Signed-off-by: Yendapally Reddy Dhananjaya Reddy
<yendapally.re...@broadcom.com>
-Fixes: ddc24ae1 ("net: phy: Broadcom iProc MDIO bus driver")
-Reviewed-by: Florian Fainelli <f.faine...@gmail.com>
-Signed-off-by: Jon Mason <jon.ma...@broadcom.com>
-Signed-off-by: David S. Miller <da...@davemloft.net>
----
- drivers/net/phy/mdio-bcm-iproc.c | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
---- a/drivers/net/phy/mdio-bcm-iproc.c
-+++ b/drivers/net/phy/mdio-bcm-iproc.c
-@@ -81,8 +81,6 @@ static int iproc_mdio_read(struct mii_bu
- if (rc)
- return rc;
-
-- iproc_mdio_config_clk(priv->base);
--
- /* Prepare the read operation */
- cmd = (MII_DATA_TA_VAL << MII_DATA_TA_SHIFT) |
- (reg << MII_DATA_RA_SHIFT) |
-@@ -112,8 +110,6 @@ static int iproc_mdio_write(struct mii_b
- if (rc)
- return rc;
-
-- iproc_mdio_config_clk(priv->base);
--
- /* Prepare the write operation */
- cmd = (MII_DATA_TA_VAL << MII_DATA_TA_SHIFT) |
- (reg << MII_DATA_RA_SHIFT) |
-@@ -163,6 +159,8 @@ static int iproc_mdio_probe(struct platf
- bus->read = iproc_mdio_read;
- bus->write = iproc_mdio_write;
-
-+ iproc_mdio_config_clk(priv->base);
-+
- rc = of_mdiobus_register(bus, pdev->dev.of_node);
- if (rc) {
- dev_err(&pdev->dev, "MDIO bus registration failed\n");
diff --git
a/target/linux/brcm2708/patches-4.9/950-0019-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch
b/target/linux/brcm2708/patches-4.9/950-0019-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch
index e800713..c402fe2 100644
---
a/target/linux/brcm2708/patches-4.9/950-0019-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch
+++
b/target/linux/brcm2708/patches-4.9/950-0019-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch
@@ -46,7 +46,7 @@ Signed-off-by: Noralf Trønnes <nor...@tronnes.org>
struct bcm2835_dmadev {
struct dma_device ddev;
-@@ -922,6 +924,9 @@ static int bcm2835_dma_probe(struct plat
+@@ -925,6 +927,9 @@ static int bcm2835_dma_probe(struct plat
base = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(base))
return PTR_ERR(base);
@@ -56,7 +56,7 @@ Signed-off-by: Noralf Trønnes <nor...@tronnes.org>
od->base = base;
-@@ -959,6 +964,9 @@ static int bcm2835_dma_probe(struct plat
+@@ -962,6 +967,9 @@ static int bcm2835_dma_probe(struct plat
goto err_no_dma;
}
@@ -66,7 +66,7 @@ Signed-off-by: Noralf Trønnes <nor...@tronnes.org>
/* get irqs for each channel that we support */
for (i = 0; i <= BCM2835_DMA_MAX_DMA_CHAN_SUPPORTED; i++) {
/* skip masked out channels */
-@@ -1033,6 +1041,7 @@ static int bcm2835_dma_remove(struct pla
+@@ -1036,6 +1044,7 @@ static int bcm2835_dma_remove(struct pla
{
struct bcm2835_dmadev *od = platform_get_drvdata(pdev);
@@ -74,7 +74,7 @@ Signed-off-by: Noralf Trønnes <nor...@tronnes.org>
dma_async_device_unregister(&od->ddev);
bcm2835_dma_free(od);
-@@ -1048,7 +1057,22 @@ static struct platform_driver bcm2835_dm
+@@ -1051,7 +1060,22 @@ static struct platform_driver bcm2835_dm
},
};
diff --git
a/target/linux/brcm2708/patches-4.9/950-0187-dmaengine-bcm2835-Fix-cyclic-DMA-period-splitting.patch
b/target/linux/brcm2708/patches-4.9/950-0187-dmaengine-bcm2835-Fix-cyclic-DMA-period-splitting.patch
deleted file mode 100644
index fa0d998..0000000
---
a/target/linux/brcm2708/patches-4.9/950-0187-dmaengine-bcm2835-Fix-cyclic-DMA-period-splitting.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 9fd7a158ec098ab05b8d3ec2c2973b3dc7e498f3 Mon Sep 17 00:00:00 2001
-From: Matthias Reichl <h...@horus.com>
-Date: Mon, 20 Feb 2017 20:01:16 +0100
-Subject: [PATCH] dmaengine: bcm2835: Fix cyclic DMA period splitting
-
-The code responsible for splitting periods into chunks that
-can be handled by the DMA controller missed to update total_len,
-the number of bytes processed in the current period, when there
-are more chunks to follow.
-
-Therefore total_len was stuck at 0 and the code didn't work at all.
-This resulted in a wrong control block layout and audio issues because
-the cyclic DMA callback wasn't executing on period boundaries.
-
-Fix this by adding the missing total_len update.
-
-Signed-off-by: Matthias Reichl <h...@horus.com>
-Signed-off-by: Martin Sperl <ker...@martin.sperl.org>
-Tested-by: Clive Messer <clive.mes...@digitaldreamtime.co.uk>
-Reviewed-by: Eric Anholt <e...@anholt.net>
----
- drivers/dma/bcm2835-dma.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
---- a/drivers/dma/bcm2835-dma.c
-+++ b/drivers/dma/bcm2835-dma.c
-@@ -253,8 +253,11 @@ static void bcm2835_dma_create_cb_set_le
- */
-
- /* have we filled in period_length yet? */
-- if (*total_len + control_block->length < period_len)
-+ if (*total_len + control_block->length < period_len) {
-+ /* update number of bytes in this period so far */
-+ *total_len += control_block->length;
- return;
-+ }
-
- /* calculate the length that remains to reach period_length */
- control_block->length = period_len - *total_len;
diff --git
a/target/linux/generic/patches-4.9/061-v4.10-0002-mtd-spi-nor-fix-spansion-quad-enable.patch
b/target/linux/generic/patches-4.9/061-v4.10-0002-mtd-spi-nor-fix-spansion-quad-enable.patch
index cd0aa46..c5e29c7 100644
---
a/target/linux/generic/patches-4.9/061-v4.10-0002-mtd-spi-nor-fix-spansion-quad-enable.patch
+++
b/target/linux/generic/patches-4.9/061-v4.10-0002-mtd-spi-nor-fix-spansion-quad-enable.patch
@@ -26,8 +26,8 @@ Signed-off-by: Cyrille Pitchen <cyrille.pitc...@atmel.com>
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1256,6 +1256,13 @@ static int spansion_quad_enable(struct s
- return -EINVAL;
+@@ -1263,6 +1263,13 @@ static int spansion_quad_enable(struct s
+ return ret;
}
+ ret = spi_nor_wait_till_ready(nor);
diff --git
a/target/linux/generic/patches-4.9/062-v4.11-0001-mtd-spi-nor-Add-support-for-S3AN-spi-nor-devices.patch
b/target/linux/generic/patches-4.9/062-v4.11-0001-mtd-spi-nor-Add-support-for-S3AN-spi-nor-devices.patch
index df36f6b..87b83cc 100644
---
a/target/linux/generic/patches-4.9/062-v4.11-0001-mtd-spi-nor-Add-support-for-S3AN-spi-nor-devices.patch
+++
b/target/linux/generic/patches-4.9/062-v4.11-0001-mtd-spi-nor-Add-support-for-S3AN-spi-nor-devices.patch
@@ -206,7 +206,7 @@ Signed-off-by: Cyrille Pitchen <cyrille.pitc...@atmel.com>
if (ret < 0)
goto write_err;
written = ret;
-@@ -1312,6 +1401,47 @@ static int spi_nor_check(struct spi_nor
+@@ -1319,6 +1408,47 @@ static int spi_nor_check(struct spi_nor
return 0;
}
@@ -254,7 +254,7 @@ Signed-off-by: Cyrille Pitchen <cyrille.pitc...@atmel.com>
int spi_nor_scan(struct spi_nor *nor, const char *name, enum read_mode mode)
{
const struct flash_info *info = NULL;
-@@ -1360,6 +1490,14 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -1367,6 +1497,14 @@ int spi_nor_scan(struct spi_nor *nor, co
mutex_init(&nor->lock);
/*
@@ -269,7 +269,7 @@ Signed-off-by: Cyrille Pitchen <cyrille.pitc...@atmel.com>
* Atmel, SST, Intel/Numonyx, and others serial NOR tend to power up
* with the software protection bits set
*/
-@@ -1517,6 +1655,12 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -1524,6 +1662,12 @@ int spi_nor_scan(struct spi_nor *nor, co
nor->read_dummy = spi_nor_read_dummy_cycles(nor);
diff --git
a/target/linux/generic/patches-4.9/062-v4.11-0004-mtd-spi-nor-rename-SPINOR_OP_-macros-of-the-4-byte-a.patch
b/target/linux/generic/patches-4.9/062-v4.11-0004-mtd-spi-nor-rename-SPINOR_OP_-macros-of-the-4-byte-a.patch
index 9bdce04..d436789 100644
---
a/target/linux/generic/patches-4.9/062-v4.11-0004-mtd-spi-nor-rename-SPINOR_OP_-macros-of-the-4-byte-a.patch
+++
b/target/linux/generic/patches-4.9/062-v4.11-0004-mtd-spi-nor-rename-SPINOR_OP_-macros-of-the-4-byte-a.patch
@@ -95,7 +95,7 @@ Acked-by: Marek Vasut <marek.va...@gmail.com>
static struct seq_rw_config stfsm_s25fl_write4_configs[] = {
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1625,16 +1625,16 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -1632,16 +1632,16 @@ int spi_nor_scan(struct spi_nor *nor, co
/* Dedicated 4-byte command set */
switch (nor->flash_read) {
case SPI_NOR_QUAD:
diff --git
a/target/linux/generic/patches-4.9/062-v4.11-0005-mtd-spi-nor-add-a-stateless-method-to-support-memory.patch
b/target/linux/generic/patches-4.9/062-v4.11-0005-mtd-spi-nor-add-a-stateless-method-to-support-memory.patch
index 8e994e6..dc05fe3 100644
---
a/target/linux/generic/patches-4.9/062-v4.11-0005-mtd-spi-nor-add-a-stateless-method-to-support-memory.patch
+++
b/target/linux/generic/patches-4.9/062-v4.11-0005-mtd-spi-nor-add-a-stateless-method-to-support-memory.patch
@@ -116,7 +116,7 @@ Acked-by: Marek Vasut <marek.va...@gmail.com>
/* Enable/disable 4-byte addressing mode. */
static inline int set_4byte(struct spi_nor *nor, const struct flash_info
*info,
int enable)
-@@ -1621,27 +1697,10 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -1628,27 +1704,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;
diff --git
a/target/linux/generic/patches-4.9/121-of-Add-check-to-of_scan_flat_dt-before-accessing-ini.patch
b/target/linux/generic/patches-4.9/121-of-Add-check-to-of_scan_flat_dt-before-accessing-ini.patch
deleted file mode 100644
index bc05dce..0000000
---
a/target/linux/generic/patches-4.9/121-of-Add-check-to-of_scan_flat_dt-before-accessing-ini.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Tobias Wolf <dev-n...@vplace.de>
-Date: Wed, 23 Nov 2016 10:40:07 +0100
-Subject: [PATCH] of: Add check to of_scan_flat_dt() before accessing
- initial_boot_params
-
-An empty __dtb_start to __dtb_end section might result in initial_boot_params
-being null for arch/mips/ralink. This showed that the boot process hangs
-indefinitely in of_scan_flat_dt().
-
-Signed-off-by: Tobias Wolf <dev-n...@vplace.de>
----
-
---- a/drivers/of/fdt.c
-+++ b/drivers/of/fdt.c
-@@ -741,9 +741,12 @@ int __init of_scan_flat_dt(int (*it)(uns
- const char *pathp;
- int offset, rc = 0, depth = -1;
-
-- for (offset = fdt_next_node(blob, -1, &depth);
-- offset >= 0 && depth >= 0 && !rc;
-- offset = fdt_next_node(blob, offset, &depth)) {
-+ if (!blob)
-+ return 0;
-+
-+ for (offset = fdt_next_node(blob, -1, &depth);
-+ offset >= 0 && depth >= 0 && !rc;
-+ offset = fdt_next_node(blob, offset, &depth)) {
-
- pathp = fdt_get_name(blob, offset, NULL);
- if (*pathp == '/')
diff --git
a/target/linux/generic/patches-4.9/465-m25p80-mx-disable-software-protection.patch
b/target/linux/generic/patches-4.9/465-m25p80-mx-disable-software-protection.patch
index b42ff2e..16bdfb3 100644
---
a/target/linux/generic/patches-4.9/465-m25p80-mx-disable-software-protection.patch
+++
b/target/linux/generic/patches-4.9/465-m25p80-mx-disable-software-protection.patch
@@ -4,7 +4,7 @@ Signed-off-by: Felix Fietkau <n...@nbd.name>
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1588,6 +1588,7 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -1595,6 +1595,7 @@ int spi_nor_scan(struct spi_nor *nor, co
if (JEDEC_MFR(info) == SNOR_MFR_ATMEL ||
JEDEC_MFR(info) == SNOR_MFR_INTEL ||
diff --git
a/target/linux/lantiq/patches-4.9/0093-spi-double-time-out-tolerance.patch
b/target/linux/lantiq/patches-4.9/0093-spi-double-time-out-tolerance.patch
deleted file mode 100644
index 68b0ffe..0000000
--- a/target/linux/lantiq/patches-4.9/0093-spi-double-time-out-tolerance.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 833bfade96561216aa2129516a5926a0326860a2 Mon Sep 17 00:00:00 2001
-From: Hauke Mehrtens <ha...@hauke-m.de>
-Date: Mon, 17 Apr 2017 01:38:05 +0200
-Subject: spi: double time out tolerance
-
-The generic SPI code calculates how long the issued transfer would take
-and adds 100ms in addition to the timeout as tolerance. On my 500 MHz
-Lantiq Mips SoC I am getting timeouts from the SPI like this when the
-system boots up:
-
-m25p80 spi32766.4: SPI transfer timed out
-blk_update_request: I/O error, dev mtdblock3, sector 2
-SQUASHFS error: squashfs_read_data failed to read block 0x6e
-
-After increasing the tolerance for the timeout to 200ms I haven't seen
-these SPI transfer time outs any more.
-The Lantiq SPI driver in use here has an extra work queue in between,
-which gets triggered when the controller send the last word and the
-hardware FIFOs used for reading and writing are only 8 words long.
-
-Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
-Signed-off-by: Mark Brown <broo...@kernel.org>
----
- drivers/spi/spi.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/spi/spi.c
-+++ b/drivers/spi/spi.c
-@@ -1004,7 +1004,7 @@ static int spi_transfer_one_message(stru
- ret = 0;
- ms = 8LL * 1000LL * xfer->len;
- do_div(ms, xfer->speed_hz);
-- ms += ms + 100; /* some tolerance */
-+ ms += ms + 200; /* some tolerance */
-
- if (ms > UINT_MAX)
- ms = UINT_MAX;
diff --git
a/target/linux/mvebu/patches-4.9/432-phy-marvell-88E1512-add-flow-control-support.patch
b/target/linux/mvebu/patches-4.9/432-phy-marvell-88E1512-add-flow-control-support.patch
index 407d23a..1f69d5e 100644
---
a/target/linux/mvebu/patches-4.9/432-phy-marvell-88E1512-add-flow-control-support.patch
+++
b/target/linux/mvebu/patches-4.9/432-phy-marvell-88E1512-add-flow-control-support.patch
@@ -12,7 +12,7 @@ Signed-off-by: Russell King <rmk+ker...@arm.linux.org.uk>
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
-@@ -1679,7 +1679,8 @@ static struct phy_driver marvell_drivers
+@@ -1677,7 +1677,8 @@ static struct phy_driver marvell_drivers
.phy_id = MARVELL_PHY_ID_88E1510,
.phy_id_mask = MARVELL_PHY_ID_MASK,
.name = "Marvell 88E1510",
diff --git
a/target/linux/mvebu/patches-4.9/433-phy-marvell-88E1111-add-flow-control-support.patch
b/target/linux/mvebu/patches-4.9/433-phy-marvell-88E1111-add-flow-control-support.patch
index 9a165fd..1d18725 100644
---
a/target/linux/mvebu/patches-4.9/433-phy-marvell-88E1111-add-flow-control-support.patch
+++
b/target/linux/mvebu/patches-4.9/433-phy-marvell-88E1111-add-flow-control-support.patch
@@ -11,7 +11,7 @@ Signed-off-by: Russell King <rmk+ker...@armlinux.org.uk>
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
-@@ -1531,7 +1531,7 @@ static struct phy_driver marvell_drivers
+@@ -1529,7 +1529,7 @@ static struct phy_driver marvell_drivers
.phy_id = MARVELL_PHY_ID_88E1111,
.phy_id_mask = MARVELL_PHY_ID_MASK,
.name = "Marvell 88E1111",
diff --git
a/target/linux/mvebu/patches-4.9/434-phy-marvell-88E1540-add-flow-control-support.patch
b/target/linux/mvebu/patches-4.9/434-phy-marvell-88E1540-add-flow-control-support.patch
index e452f01..ef20147 100644
---
a/target/linux/mvebu/patches-4.9/434-phy-marvell-88E1540-add-flow-control-support.patch
+++
b/target/linux/mvebu/patches-4.9/434-phy-marvell-88E1540-add-flow-control-support.patch
@@ -11,7 +11,7 @@ Signed-off-by: Russell King <rmk+ker...@armlinux.org.uk>
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
-@@ -1699,7 +1699,7 @@ static struct phy_driver marvell_drivers
+@@ -1697,7 +1697,7 @@ static struct phy_driver marvell_drivers
.phy_id = MARVELL_PHY_ID_88E1540,
.phy_id_mask = MARVELL_PHY_ID_MASK,
.name = "Marvell 88E1540",
diff --git
a/target/linux/mvebu/patches-4.9/435-net-phy-fix-marvell-phy-status-reading.patch
b/target/linux/mvebu/patches-4.9/435-net-phy-fix-marvell-phy-status-reading.patch
deleted file mode 100644
index a39b694..0000000
---
a/target/linux/mvebu/patches-4.9/435-net-phy-fix-marvell-phy-status-reading.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Russell King <rmk+ker...@armlinux.org.uk>
-Date: Fri, 23 Dec 2016 18:54:01 +0000
-Subject: [PATCH] net: phy: fix marvell phy status reading
-
-The Marvell driver incorrectly provides phydev->lp_advertising as the
-logical and of the link partner's advert and our advert. This is
-incorrect - this field is supposed to store the link parter's unmodified
-advertisment.
-
-This allows ethtool to report the correct link partner auto-negotiation
-status.
-
-Signed-off-by: Russell King <rmk+ker...@armlinux.org.uk>
----
-
---- a/drivers/net/phy/marvell.c
-+++ b/drivers/net/phy/marvell.c
-@@ -1114,8 +1114,6 @@ static int marvell_read_status_page(stru
- if (adv < 0)
- return adv;
-
-- lpa &= adv;
--
- if (status & MII_M1011_PHY_STATUS_FULLDUPLEX)
- phydev->duplex = DUPLEX_FULL;
- else
diff --git
a/target/linux/pistachio/patches-4.9/401-mtd-nor-support-mtd-name-from-device-tree.patch
b/target/linux/pistachio/patches-4.9/401-mtd-nor-support-mtd-name-from-device-tree.patch
index 6e3c711..9c4d044 100644
---
a/target/linux/pistachio/patches-4.9/401-mtd-nor-support-mtd-name-from-device-tree.patch
+++
b/target/linux/pistachio/patches-4.9/401-mtd-nor-support-mtd-name-from-device-tree.patch
@@ -10,7 +10,7 @@ Signed-off-by: Abhimanyu Vishwakarma
<abhimanyu.vishwaka...@imgtec.com>
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1534,6 +1534,7 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -1541,6 +1541,7 @@ int spi_nor_scan(struct spi_nor *nor, co
struct device *dev = nor->dev;
struct mtd_info *mtd = &nor->mtd;
struct device_node *np = spi_nor_get_flash_node(nor);
@@ -18,7 +18,7 @@ Signed-off-by: Abhimanyu Vishwakarma
<abhimanyu.vishwaka...@imgtec.com>
int ret;
int i;
-@@ -1598,7 +1599,12 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -1605,7 +1606,12 @@ int spi_nor_scan(struct spi_nor *nor, co
spi_nor_wait_till_ready(nor);
}
diff --git
a/target/linux/ramips/patches-4.9/0054-mtd-add-chunked-read-io-to-m25p80.patch
b/target/linux/ramips/patches-4.9/0054-mtd-add-chunked-read-io-to-m25p80.patch
index ffea0b4..40994fb 100644
---
a/target/linux/ramips/patches-4.9/0054-mtd-add-chunked-read-io-to-m25p80.patch
+++
b/target/linux/ramips/patches-4.9/0054-mtd-add-chunked-read-io-to-m25p80.patch
@@ -67,7 +67,7 @@
static int macronix_quad_enable(struct spi_nor *nor)
{
int ret, val;
-@@ -1623,10 +1683,12 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -1630,10 +1690,12 @@ int spi_nor_scan(struct spi_nor *nor, co
}
/* sst nor chips use AAI word program */
@@ -82,7 +82,7 @@
if (info->flags & USE_FSR)
nor->flags |= SNOR_F_USE_FSR;
-@@ -1656,11 +1718,20 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -1663,11 +1725,20 @@ int spi_nor_scan(struct spi_nor *nor, co
mtd->writebufsize = nor->page_size;
if (np) {
--
2.7.4
_______________________________________________
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
