aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/apm821xx/patches-4.14
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-10-22 14:11:59 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-10-22 15:28:31 +0200
commitbc3d47cd121baf85d53a3ee3f9d45df5ccf58f6f (patch)
tree753ee1f99a8a157059f2d50c0b4dddba567cc51c /target/linux/apm821xx/patches-4.14
parent9c42391c0d7418fc604152b2c552a1b9d964a3fc (diff)
downloadupstream-bc3d47cd121baf85d53a3ee3f9d45df5ccf58f6f.tar.gz
upstream-bc3d47cd121baf85d53a3ee3f9d45df5ccf58f6f.tar.bz2
upstream-bc3d47cd121baf85d53a3ee3f9d45df5ccf58f6f.zip
kernel: bump 4.14 to 4.14.78
Refreshed all patches. Remove upstreamed: - 050-net-emac-fix-fixed-link-setup-for-the-RTL8363SB-swit.patch Compile-tested on: cns3xxx, imx6 Runtime-tested on: cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/apm821xx/patches-4.14')
-rw-r--r--target/linux/apm821xx/patches-4.14/030-0002-net-ibm-emac-replace-custom-PHY_MODE_-macros.patch4
-rw-r--r--target/linux/apm821xx/patches-4.14/050-net-emac-fix-fixed-link-setup-for-the-RTL8363SB-swit.patch48
2 files changed, 2 insertions, 50 deletions
diff --git a/target/linux/apm821xx/patches-4.14/030-0002-net-ibm-emac-replace-custom-PHY_MODE_-macros.patch b/target/linux/apm821xx/patches-4.14/030-0002-net-ibm-emac-replace-custom-PHY_MODE_-macros.patch
index e4a722646e..ba4fb5f717 100644
--- a/target/linux/apm821xx/patches-4.14/030-0002-net-ibm-emac-replace-custom-PHY_MODE_-macros.patch
+++ b/target/linux/apm821xx/patches-4.14/030-0002-net-ibm-emac-replace-custom-PHY_MODE_-macros.patch
@@ -47,7 +47,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
}
static inline void emac_tx_enable(struct emac_instance *dev)
-@@ -2865,7 +2865,7 @@ static int emac_init_config(struct emac_
+@@ -2870,7 +2870,7 @@ static int emac_init_config(struct emac_
/* PHY mode needs some decoding */
dev->phy_mode = of_get_phy_mode(np);
if (dev->phy_mode < 0)
@@ -56,7 +56,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
/* Check EMAC version */
if (of_device_is_compatible(np, "ibm,emac4sync")) {
-@@ -3168,7 +3168,7 @@ static int emac_probe(struct platform_de
+@@ -3173,7 +3173,7 @@ static int emac_probe(struct platform_de
printk(KERN_INFO "%s: EMAC-%d %pOF, MAC %pM\n",
ndev->name, dev->cell_index, np, ndev->dev_addr);
diff --git a/target/linux/apm821xx/patches-4.14/050-net-emac-fix-fixed-link-setup-for-the-RTL8363SB-swit.patch b/target/linux/apm821xx/patches-4.14/050-net-emac-fix-fixed-link-setup-for-the-RTL8363SB-swit.patch
deleted file mode 100644
index 05e29f963e..0000000000
--- a/target/linux/apm821xx/patches-4.14/050-net-emac-fix-fixed-link-setup-for-the-RTL8363SB-swit.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 08e39982ef64f800fd1f9b9b92968d14d5fafa82 Mon Sep 17 00:00:00 2001
-From: Christian Lamparter <chunkeey@gmail.com>
-Date: Mon, 17 Sep 2018 17:22:40 +0200
-Subject: net: emac: fix fixed-link setup for the RTL8363SB switch
-
-On the Netgear WNDAP620, the emac ethernet isn't receiving nor
-xmitting any frames from/to the RTL8363SB (identifies itself
-as a RTL8367RB).
-
-This is caused by the emac hardware not knowing the forced link
-parameters for speed, duplex, pause, etc.
-
-This begs the question, how this was working on the original
-driver code, when it was necessary to set the phy_address and
-phy_map to 0xffffffff. But I guess without access to the old
-PPC405/440/460 hardware, it's not possible to know.
-
-Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- drivers/net/ethernet/ibm/emac/core.c | 15 ++++++++++-----
- 1 file changed, 10 insertions(+), 5 deletions(-)
-
---- a/drivers/net/ethernet/ibm/emac/core.c
-+++ b/drivers/net/ethernet/ibm/emac/core.c
-@@ -2671,12 +2671,17 @@ static int emac_init_phy(struct emac_ins
- if (of_phy_is_fixed_link(np)) {
- int res = emac_dt_mdio_probe(dev);
-
-- if (!res) {
-- res = of_phy_register_fixed_link(np);
-- if (res)
-- mdiobus_unregister(dev->mii_bus);
-+ if (res)
-+ return res;
-+
-+ res = of_phy_register_fixed_link(np);
-+ dev->phy_dev = of_phy_find_device(np);
-+ if (res || !dev->phy_dev) {
-+ mdiobus_unregister(dev->mii_bus);
-+ return res ? res : -EINVAL;
- }
-- return res;
-+ emac_adjust_link(dev->ndev);
-+ put_device(&dev->phy_dev->mdio.dev);
- }
- return 0;
- }