diff options
author | Yangbo Lu <yangbo.lu@nxp.com> | 2020-04-10 10:47:05 +0800 |
---|---|---|
committer | Petr Štetiar <ynezz@true.cz> | 2020-05-07 12:53:06 +0200 |
commit | cddd4591404fb4c53dc0b3c0b15b942cdbed4356 (patch) | |
tree | 392c1179de46b0f804e3789edca19069b64e6b44 /target/linux/layerscape/patches-5.4/701-net-0227-enetc-Fix-if_mode-extraction.patch | |
parent | d1d2c0b5579ea4f69a42246c9318539d61ba1999 (diff) | |
download | upstream-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-0227-enetc-Fix-if_mode-extraction.patch')
-rw-r--r-- | target/linux/layerscape/patches-5.4/701-net-0227-enetc-Fix-if_mode-extraction.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/target/linux/layerscape/patches-5.4/701-net-0227-enetc-Fix-if_mode-extraction.patch b/target/linux/layerscape/patches-5.4/701-net-0227-enetc-Fix-if_mode-extraction.patch new file mode 100644 index 0000000000..37cbcd9777 --- /dev/null +++ b/target/linux/layerscape/patches-5.4/701-net-0227-enetc-Fix-if_mode-extraction.patch @@ -0,0 +1,46 @@ +From 7b75e86c2cfc9fa48b582b04e939f18a54bdfa2e Mon Sep 17 00:00:00 2001 +From: Claudiu Manoil <claudiu.manoil@nxp.com> +Date: Tue, 13 Aug 2019 13:59:24 +0300 +Subject: [PATCH] enetc: Fix if_mode extraction + +If if_mode not found then just handle it as fixed link +(i.e mac2mac connection). + +Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com> +--- + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 17 ++++++----------- + 1 file changed, 6 insertions(+), 11 deletions(-) + +--- a/drivers/net/ethernet/freescale/enetc/enetc_pf.c ++++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.c +@@ -754,6 +754,7 @@ static int enetc_of_get_phy(struct enetc + struct enetc_pf *pf = enetc_si_priv(priv->si); + struct device_node *np = priv->dev->of_node; + struct device_node *mdio_np; ++ int phy_mode; + int err; + + if (!np) { +@@ -787,17 +788,11 @@ static int enetc_of_get_phy(struct enetc + } + } + +- priv->if_mode = of_get_phy_mode(np); +- if ((int)priv->if_mode < 0) { +- dev_err(priv->dev, "missing phy type\n"); +- of_node_put(priv->phy_node); +- if (of_phy_is_fixed_link(np)) +- of_phy_deregister_fixed_link(np); +- else +- enetc_mdio_remove(pf); +- +- return -EINVAL; +- } ++ phy_mode = of_get_phy_mode(np); ++ if (phy_mode < 0) ++ priv->if_mode = PHY_INTERFACE_MODE_NA; /* fixed link */ ++ else ++ priv->if_mode = phy_mode; + + return 0; + } |