aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/apm821xx/patches-4.14/030-0002-net-ibm-emac-replace-custom-PHY_MODE_-macros.patch
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/030-0002-net-ibm-emac-replace-custom-PHY_MODE_-macros.patch
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/030-0002-net-ibm-emac-replace-custom-PHY_MODE_-macros.patch')
-rw-r--r--target/linux/apm821xx/patches-4.14/030-0002-net-ibm-emac-replace-custom-PHY_MODE_-macros.patch4
1 files changed, 2 insertions, 2 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);