aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4/701-net-0232-enetc-Handle-USXGMII-protocol.patch
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-02-17 05:58:14 -0500
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2021-02-18 20:04:50 +0100
commit5d3a6fd970619dfc55f8259035c3027d7613a2a6 (patch)
tree2a71f22994a12b2589e061d6e821c8c93fb9cb29 /target/linux/layerscape/patches-5.4/701-net-0232-enetc-Handle-USXGMII-protocol.patch
parent0db9d118657dd93509abec817eb22ce13d0ec1b6 (diff)
downloadupstream-5d3a6fd970619dfc55f8259035c3027d7613a2a6.tar.gz
upstream-5d3a6fd970619dfc55f8259035c3027d7613a2a6.tar.bz2
upstream-5d3a6fd970619dfc55f8259035c3027d7613a2a6.zip
kernel: bump 5.4 to 5.4.99
Ran update_kernel.sh in a fresh clone without any existing toolchains. No manual changes needed. Build system: x86_64 Build-tested: bcm27xx/bcm2711 Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/701-net-0232-enetc-Handle-USXGMII-protocol.patch')
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0232-enetc-Handle-USXGMII-protocol.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/layerscape/patches-5.4/701-net-0232-enetc-Handle-USXGMII-protocol.patch b/target/linux/layerscape/patches-5.4/701-net-0232-enetc-Handle-USXGMII-protocol.patch
index d1e7004546..214d088113 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0232-enetc-Handle-USXGMII-protocol.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0232-enetc-Handle-USXGMII-protocol.patch
@@ -23,7 +23,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
enetc_port_wr(hw, ENETC_PM0_IF_MODE, ENETC_PM0_IFM_XGMII);
}
-@@ -844,7 +845,8 @@ static int enetc_configure_serdes(struct
+@@ -889,7 +890,8 @@ static int enetc_configure_serdes(struct
int err;
if (priv->if_mode != PHY_INTERFACE_MODE_SGMII &&
@@ -33,7 +33,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
return 0;
err = enetc_imdio_init(pf);
-@@ -854,7 +856,8 @@ static int enetc_configure_serdes(struct
+@@ -899,7 +901,8 @@ static int enetc_configure_serdes(struct
if (priv->if_mode == PHY_INTERFACE_MODE_SGMII)
enetc_configure_sgmii(pf->imdio);