Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a93f7fe1 authored by Jian Shen's avatar Jian Shen Committed by David S. Miller
Browse files

net: phy: marvell: add new default led configure for m88e151x 



The default m88e151x LED configuration is 0x1177, used LED[0]
for 1000M link, LED[1] for 100M link, and LED[2] for active.
But for some boards, which use LED[0] for link, and LED[1] for
active, prefer to be 0x1040. To be compatible with this case,
this patch defines a new dev_flag, and set it before connect
phy in HNS3 driver. When phy initializing, using the new
LED configuration if this dev_flag is set.

Signed-off-by: default avatarJian Shen <shenjian15@huawei.com>
Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7e6e185c

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c

+3 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 


#include <linux/etherdevice.h>

#include <linux/kernel.h>

#include <linux/marvell_phy.h>



#include "hclge_cmd.h"

#include "hclge_main.h"
@@ -209,6 +210,8 @@ int hclge_mac_connect_phy(struct hnae3_handle *handle) 


	linkmode_clear_bit(ETHTOOL_LINK_MODE_FIBRE_BIT, phydev->supported);



	phydev->dev_flags |= MARVELL_PHY_LED0_LINK_LED1_ACTIVE;



	ret = phy_connect_direct(netdev, phydev,

				 hclge_mac_adjust_link,

				 PHY_INTERFACE_MODE_SGMII);

drivers/net/phy/marvell.c

+5 −1
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ 
#define MII_PHY_LED_CTRL	        16

#define MII_88E1121_PHY_LED_DEF		0x0030

#define MII_88E1510_PHY_LED_DEF		0x1177

#define MII_88E1510_PHY_LED0_LINK_LED1_ACTIVE	0x1040



#define MII_M1011_PHY_STATUS		0x11

#define MII_M1011_PHY_STATUS_1000	0x8000
@@ -633,6 +634,9 @@ static void marvell_config_led(struct phy_device *phydev) 
	 * LED[2] .. Blink, Activity

	 */

	case MARVELL_PHY_FAMILY_ID(MARVELL_PHY_ID_88E1510):

		if (phydev->dev_flags & MARVELL_PHY_LED0_LINK_LED1_ACTIVE)

			def_config = MII_88E1510_PHY_LED0_LINK_LED1_ACTIVE;

		else

			def_config = MII_88E1510_PHY_LED_DEF;

		break;

	default:

include/linux/marvell_phy.h

+1 −0
Original line number Diff line number Diff line
@@ -34,5 +34,6 @@ 
/* struct phy_device dev_flags definitions */

#define MARVELL_PHY_M1145_FLAGS_RESISTANCE	0x00000001

#define MARVELL_PHY_M1118_DNS323_LEDS		0x00000002

#define MARVELL_PHY_LED0_LINK_LED1_ACTIVE	0x00000004



#endif /* _MARVELL_PHY_H */