From 69649a1b45ee0ab7ab3de350dc75f89d867c174c Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Mon, 26 Jun 2017 11:22:11 +0200 Subject: kernel: update kernel 4.9 to 4.9.34 - Refreshed all patches - Adapted 1 (0031-mtd-add-SMEM-parser-for-QCOM-platforms.patch) Compile tested on: brcm2708, cns3xxx, imx6 Run tested on: brcm2708, cns3xxx, imx6 Signed-off-by: Koen Vandeputte [Compile and run tested on brcm2708] Signed-off-by: Stijn Tintel --- target/linux/mvebu/patches-4.9/100-find_active_root.patch | 6 +++--- .../400-phy-provide-a-hook-for-link-up-link-down-events.patch | 2 +- .../407-net-phy-add-802.3-clause-45-support-to-phylib.patch | 2 +- .../mvebu/patches-4.9/415-phylink-add-phylink-infrastructure.patch | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'target/linux/mvebu') diff --git a/target/linux/mvebu/patches-4.9/100-find_active_root.patch b/target/linux/mvebu/patches-4.9/100-find_active_root.patch index b8e8c92aab..d6006b7444 100644 --- a/target/linux/mvebu/patches-4.9/100-find_active_root.patch +++ b/target/linux/mvebu/patches-4.9/100-find_active_root.patch @@ -22,9 +22,9 @@ Signed-off-by: Imre Kaloz struct device_node *pp; int nr_parts, i, ret = 0; bool dedicated = true; -@@ -109,9 +112,13 @@ static int parse_ofpart_partitions(struc - parts[i].offset = of_read_number(reg, a_cells); +@@ -110,9 +113,13 @@ static int parse_ofpart_partitions(struc parts[i].size = of_read_number(reg + a_cells, s_cells); + parts[i].of_node = pp; - partname = of_get_property(pp, "label", &len); - if (!partname) @@ -39,7 +39,7 @@ Signed-off-by: Imre Kaloz parts[i].name = partname; if (of_get_property(pp, "read-only", &len)) -@@ -212,6 +219,18 @@ static int __init ofpart_parser_init(voi +@@ -213,6 +220,18 @@ static int __init ofpart_parser_init(voi return 0; } diff --git a/target/linux/mvebu/patches-4.9/400-phy-provide-a-hook-for-link-up-link-down-events.patch b/target/linux/mvebu/patches-4.9/400-phy-provide-a-hook-for-link-up-link-down-events.patch index 268243c0fb..c5bb0c02f2 100644 --- a/target/linux/mvebu/patches-4.9/400-phy-provide-a-hook-for-link-up-link-down-events.patch +++ b/target/linux/mvebu/patches-4.9/400-phy-provide-a-hook-for-link-up-link-down-events.patch @@ -157,7 +157,7 @@ Signed-off-by: Russell King /** * phy_prepare_link - prepares the PHY layer to monitor link status * @phydev: target phy_device struct -@@ -899,6 +912,7 @@ int phy_attach_direct(struct net_device +@@ -910,6 +923,7 @@ int phy_attach_direct(struct net_device goto error; } diff --git a/target/linux/mvebu/patches-4.9/407-net-phy-add-802.3-clause-45-support-to-phylib.patch b/target/linux/mvebu/patches-4.9/407-net-phy-add-802.3-clause-45-support-to-phylib.patch index 8e983cc7ff..352d678328 100644 --- a/target/linux/mvebu/patches-4.9/407-net-phy-add-802.3-clause-45-support-to-phylib.patch +++ b/target/linux/mvebu/patches-4.9/407-net-phy-add-802.3-clause-45-support-to-phylib.patch @@ -258,7 +258,7 @@ Signed-off-by: Russell King +EXPORT_SYMBOL_GPL(genphy_c45_read_pma); --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c -@@ -1390,27 +1390,19 @@ EXPORT_SYMBOL(genphy_read_status); +@@ -1410,27 +1410,19 @@ EXPORT_SYMBOL(genphy_read_status); static int gen10g_read_status(struct phy_device *phydev) { diff --git a/target/linux/mvebu/patches-4.9/415-phylink-add-phylink-infrastructure.patch b/target/linux/mvebu/patches-4.9/415-phylink-add-phylink-infrastructure.patch index 87c0daf178..fe3f7c2972 100644 --- a/target/linux/mvebu/patches-4.9/415-phylink-add-phylink-infrastructure.patch +++ b/target/linux/mvebu/patches-4.9/415-phylink-add-phylink-infrastructure.patch @@ -83,14 +83,14 @@ Signed-off-by: Russell King obj-$(CONFIG_SWCONFIG) += swconfig.o --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c -@@ -1003,6 +1003,7 @@ void phy_detach(struct phy_device *phyde +@@ -1021,6 +1021,7 @@ void phy_detach(struct phy_device *phyde phydev->attached_dev->phydev = NULL; phydev->attached_dev = NULL; phy_suspend(phydev); + phydev->phylink = NULL; - /* If the device had no specific driver before (i.e. - it - * was using the generic driver), we unbind the device + module_put(phydev->mdio.dev.driver->owner); + --- /dev/null +++ b/drivers/net/phy/phylink.c @@ -0,0 +1,903 @@ -- cgit v1.2.3