leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: hns: fix LED configuration for marvell phy

Browse Source 
Since commit(net: phy: marvell: change default m88e1510 LED configuration),
the active LED of Hip07 devices is always off, because Hip07 just
use 2 LEDs.
This patch adds a phy_register_fixup_for_uid() for m88e1510 to
correct the LED configuration.

Fixes: 077772468e ("net: phy: marvell: change default m88e1510 LED configuration")
Signed-off-by: Yonglong Liu <liuyonglong@huawei.com>
Reviewed-by: linyunsheng <linyunsheng@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Yonglong Liu 2019-07-22 13:59:12 +08:00 committed by David S. Miller
parent bba18318e7
commit f4e5f775db
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/net/ethernet/hisilicon/hns/hns_enet.c
View File

@ -11,6 +11,7 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/ip.h> #include <linux/ip.h>
#include <linux/ipv6.h> #include <linux/ipv6.h>
#include <linux/marvell_phy.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/phy.h> #include <linux/phy.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
@ -1149,6 +1150,13 @@ static void hns_nic_adjust_link(struct net_device *ndev)
} }
} }
static int hns_phy_marvell_fixup(struct phy_device *phydev)
{
phydev->dev_flags |= MARVELL_PHY_LED0_LINK_LED1_ACTIVE;
return 0;
}
/** /**
*hns_nic_init_phy - init phy *hns_nic_init_phy - init phy
*@ndev: net device *@ndev: net device
@ -1174,6 +1182,16 @@ int hns_nic_init_phy(struct net_device *ndev, struct hnae_handle *h)
if (h->phy_if != PHY_INTERFACE_MODE_XGMII) { if (h->phy_if != PHY_INTERFACE_MODE_XGMII) {
phy_dev->dev_flags = 0; phy_dev->dev_flags = 0;
/* register the PHY fixup (for Marvell 88E1510) */
ret = phy_register_fixup_for_uid(MARVELL_PHY_ID_88E1510,
MARVELL_PHY_ID_MASK,
hns_phy_marvell_fixup);
/* we can live without it, so just issue a warning */
if (ret)
netdev_warn(ndev,
"Cannot register PHY fixup, ret=%d\n",
ret);
ret = phy_connect_direct(ndev, phy_dev, hns_nic_adjust_link, ret = phy_connect_direct(ndev, phy_dev, hns_nic_adjust_link,
h->phy_if); h->phy_if);
} else { } else {
@ -2430,8 +2448,11 @@ static int hns_nic_dev_remove(struct platform_device *pdev)
hns_nic_uninit_ring_data(priv); hns_nic_uninit_ring_data(priv);
priv->ring_data = NULL; priv->ring_data = NULL;
if (ndev->phydev) if (ndev->phydev) {
phy_unregister_fixup_for_uid(MARVELL_PHY_ID_88E1510,
MARVELL_PHY_ID_MASK);
phy_disconnect(ndev->phydev); phy_disconnect(ndev->phydev);
}
if (!IS_ERR_OR_NULL(priv->ae_handle)) if (!IS_ERR_OR_NULL(priv->ae_handle))
hnae_put_handle(priv->ae_handle); hnae_put_handle(priv->ae_handle);