openwrt/target/linux/layerscape/patches-5.4/701-net-0020-dpaa_eth-memac-set-adjust_link-callback-for-fixed-li.patch

29 lines
1.2 KiB
Diff
Raw Normal View History

From 47113bd7cb07c2399f536a2dd8f4b3a6c599dfcd Mon Sep 17 00:00:00 2001
From: Camelia Groza <camelia.groza@nxp.com>
Date: Thu, 31 Aug 2017 13:16:47 +0300
Subject: [PATCH] dpaa_eth: memac: set adjust_link callback for fixed link
interfaces
Signed-off-by: Camelia Groza <camelia.groza@nxp.com>
---
drivers/net/ethernet/freescale/sdk_dpaa/mac-api.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
--- a/drivers/net/ethernet/freescale/sdk_dpaa/mac-api.c
+++ b/drivers/net/ethernet/freescale/sdk_dpaa/mac-api.c
@@ -503,11 +503,9 @@ static int memac_init_phy(struct net_dev
{
struct phy_device *phy_dev;
- if (of_phy_is_fixed_link(mac_dev->phy_node)) {
- phy_dev = of_phy_attach(net_dev, mac_dev->phy_node,
- 0, mac_dev->phy_if);
- } else if ((macdev2enetinterface(mac_dev) == e_ENET_MODE_XGMII_10000) ||
- (macdev2enetinterface(mac_dev) == e_ENET_MODE_SGMII_2500)) {
+ if ((macdev2enetinterface(mac_dev) == e_ENET_MODE_XGMII_10000) ||
+ (macdev2enetinterface(mac_dev) == e_ENET_MODE_SGMII_2500) ||
+ of_phy_is_fixed_link(mac_dev->phy_node)) {
phy_dev = of_phy_connect(net_dev, mac_dev->phy_node,
&adjust_link_void, 0,
mac_dev->phy_if);