Commit 7467d716 authored by Horatiu Vultur's avatar Horatiu Vultur Committed by David S. Miller
Browse files

net: phy: micrel: Add config_init for LAN8814 



Add config_init for LAN8814. This function is required for the following
reasons:
- we need to make sure that the PHY is reset,
- disable ANEG with QSGMII PCS Host side
- swap the MDI-X A,B transmit so that there will not be any link flip-flaps
  when the PHY gets a link.

Signed-off-by: default avatarHoratiu Vultur <horatiu.vultur@microchip.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 24d8a900

drivers/net/phy/micrel.c

+32 −0
Original line number Diff line number Diff line
@@ -1578,6 +1578,14 @@ static int ksz886x_cable_test_get_status(struct phy_device *phydev, 
#define LAN_EXT_PAGE_ACCESS_ADDRESS_DATA		0x17

#define LAN_EXT_PAGE_ACCESS_CTRL_EP_FUNC		0x4000



#define LAN8814_QSGMII_SOFT_RESET			0x43

#define LAN8814_QSGMII_SOFT_RESET_BIT			BIT(0)

#define LAN8814_QSGMII_PCS1G_ANEG_CONFIG		0x13

#define LAN8814_QSGMII_PCS1G_ANEG_CONFIG_ANEG_ENA	BIT(3)

#define LAN8814_ALIGN_SWAP				0x4a

#define LAN8814_ALIGN_TX_A_B_SWAP			0x1

#define LAN8814_ALIGN_TX_A_B_SWAP_MASK			GENMASK(2, 0)



#define LAN8804_ALIGN_SWAP				0x4a

#define LAN8804_ALIGN_TX_A_B_SWAP			0x1

#define LAN8804_ALIGN_TX_A_B_SWAP_MASK			GENMASK(2, 0)
@@ -1614,6 +1622,29 @@ static int lanphy_write_page_reg(struct phy_device *phydev, int page, u16 addr, 
	return 0;

}



static int lan8814_config_init(struct phy_device *phydev)

{

	int val;



	/* Reset the PHY */

	val = lanphy_read_page_reg(phydev, 4, LAN8814_QSGMII_SOFT_RESET);

	val |= LAN8814_QSGMII_SOFT_RESET_BIT;

	lanphy_write_page_reg(phydev, 4, LAN8814_QSGMII_SOFT_RESET, val);



	/* Disable ANEG with QSGMII PCS Host side */

	val = lanphy_read_page_reg(phydev, 5, LAN8814_QSGMII_PCS1G_ANEG_CONFIG);

	val &= ~LAN8814_QSGMII_PCS1G_ANEG_CONFIG_ANEG_ENA;

	lanphy_write_page_reg(phydev, 5, LAN8814_QSGMII_PCS1G_ANEG_CONFIG, val);



	/* MDI-X setting for swap A,B transmit */

	val = lanphy_read_page_reg(phydev, 2, LAN8814_ALIGN_SWAP);

	val &= ~LAN8814_ALIGN_TX_A_B_SWAP_MASK;

	val |= LAN8814_ALIGN_TX_A_B_SWAP;

	lanphy_write_page_reg(phydev, 2, LAN8814_ALIGN_SWAP, val);



	return 0;

}



static int lan8804_config_init(struct phy_device *phydev)

{

	int val;
@@ -1858,6 +1889,7 @@ static struct phy_driver ksphy_driver[] = { 
	.phy_id		= PHY_ID_LAN8814,

	.phy_id_mask	= MICREL_PHY_ID_MASK,

	.name		= "Microchip INDY Gigabit Quad PHY",

	.config_init	= lan8814_config_init,

	.driver_data	= &ksz9021_type,

	.probe		= kszphy_probe,

	.soft_reset	= genphy_soft_reset,