aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4/701-net-0232-enetc-Handle-USXGMII-protocol.patch
diff options
context:
space:
mode:
authorYangbo Lu <yangbo.lu@nxp.com>2020-04-10 10:47:05 +0800
committerPetr Štetiar <ynezz@true.cz>2020-05-07 12:53:06 +0200
commitcddd4591404fb4c53dc0b3c0b15b942cdbed4356 (patch)
tree392c1179de46b0f804e3789edca19069b64e6b44 /target/linux/layerscape/patches-5.4/701-net-0232-enetc-Handle-USXGMII-protocol.patch
parentd1d2c0b5579ea4f69a42246c9318539d61ba1999 (diff)
downloadupstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.gz
upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.bz2
upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.zip
layerscape: add patches-5.4
Add patches for linux-5.4. The patches are from NXP LSDK-20.04 release which was tagged LSDK-20.04-V5.4. https://source.codeaurora.org/external/qoriq/qoriq-components/linux/ For boards LS1021A-IOT, and Traverse-LS1043 which are not involved in LSDK, port the dts patches from 4.14. The patches are sorted into the following categories: 301-arch-xxxx 302-dts-xxxx 303-core-xxxx 701-net-xxxx 801-audio-xxxx 802-can-xxxx 803-clock-xxxx 804-crypto-xxxx 805-display-xxxx 806-dma-xxxx 807-gpio-xxxx 808-i2c-xxxx 809-jailhouse-xxxx 810-keys-xxxx 811-kvm-xxxx 812-pcie-xxxx 813-pm-xxxx 814-qe-xxxx 815-sata-xxxx 816-sdhc-xxxx 817-spi-xxxx 818-thermal-xxxx 819-uart-xxxx 820-usb-xxxx 821-vfio-xxxx Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
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.patch45
1 files changed, 45 insertions, 0 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
new file mode 100644
index 0000000000..d1e7004546
--- /dev/null
+++ b/target/linux/layerscape/patches-5.4/701-net-0232-enetc-Handle-USXGMII-protocol.patch
@@ -0,0 +1,45 @@
+From bb700603e66a1294049aa479ad560443496c893b Mon Sep 17 00:00:00 2001
+From: Alex Marginean <alexandru.marginean@nxp.com>
+Date: Fri, 20 Sep 2019 19:41:10 +0300
+Subject: [PATCH] enetc: Handle USXGMII protocol
+
+Adds USXGMII protocol which is now supported in Linux. XGMII is kept for
+compatibility although there is no plain XGMII support in ENETC.
+
+Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
+---
+ drivers/net/ethernet/freescale/enetc/enetc_pf.c | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+--- a/drivers/net/ethernet/freescale/enetc/enetc_pf.c
++++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
+@@ -528,7 +528,8 @@ static void enetc_configure_port_mac(str
+ phy_mode == PHY_INTERFACE_MODE_RGMII)
+ enetc_port_wr(hw, ENETC_PM0_IF_MODE, ENETC_PM0_IFM_RGAUTO);
+
+- if (phy_mode == PHY_INTERFACE_MODE_XGMII)
++ if (phy_mode == PHY_INTERFACE_MODE_XGMII ||
++ phy_mode == PHY_INTERFACE_MODE_USXGMII)
+ enetc_port_wr(hw, ENETC_PM0_IF_MODE, ENETC_PM0_IFM_XGMII);
+ }
+
+@@ -844,7 +845,8 @@ static int enetc_configure_serdes(struct
+ int err;
+
+ if (priv->if_mode != PHY_INTERFACE_MODE_SGMII &&
+- priv->if_mode != PHY_INTERFACE_MODE_XGMII)
++ priv->if_mode != PHY_INTERFACE_MODE_XGMII &&
++ priv->if_mode != PHY_INTERFACE_MODE_USXGMII)
+ return 0;
+
+ err = enetc_imdio_init(pf);
+@@ -854,7 +856,8 @@ static int enetc_configure_serdes(struct
+ if (priv->if_mode == PHY_INTERFACE_MODE_SGMII)
+ enetc_configure_sgmii(pf->imdio);
+
+- if (priv->if_mode == PHY_INTERFACE_MODE_XGMII)
++ if (priv->if_mode == PHY_INTERFACE_MODE_XGMII ||
++ priv->if_mode == PHY_INTERFACE_MODE_USXGMII)
+ enetc_configure_sxgmii(pf->imdio);
+
+ return 0;