git.openwrt.org Git - openwrt/staging/pepe2k.git/blob

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