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

Commit 186534a3 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: systemport: use the new fixed PHY helpers 



of_phy_connect_fixed_link() is becoming obsolete, and also required
platform code to register the fixed PHYs at the specified addresses for
those to be usable. Get rid of it and use the new of_phy_is_fixed_link()
plus of_phy_register_fixed_link() helpers to transition over the new
scheme.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9abf0c2b

drivers/net/ethernet/broadcom/bcmsysport.c

+15 −2
Original line number Diff line number Diff line
@@ -1327,8 +1327,8 @@ static int bcm_sysport_open(struct net_device *dev) 
	/* Read CRC forward */

	priv->crc_fwd = !!(umac_readl(priv, UMAC_CMD) & CMD_CRC_FWD);



	priv->phydev = of_phy_connect_fixed_link(dev, bcm_sysport_adj_link,

							priv->phy_interface);

	priv->phydev = of_phy_connect(dev, priv->phy_dn, bcm_sysport_adj_link,

					0, priv->phy_interface);

	if (!priv->phydev) {

		netdev_err(dev, "could not attach to PHY\n");

		return -ENODEV;
@@ -1551,6 +1551,19 @@ static int bcm_sysport_probe(struct platform_device *pdev) 
	if (priv->phy_interface < 0)

		priv->phy_interface = PHY_INTERFACE_MODE_GMII;



	/* In the case of a fixed PHY, the DT node associated

	 * to the PHY is the Ethernet MAC DT node.

	 */

	if (of_phy_is_fixed_link(dn)) {

		ret = of_phy_register_fixed_link(dn);

		if (ret) {

			dev_err(&pdev->dev, "failed to register fixed PHY\n");

			goto err;

		}



		priv->phy_dn = dn;

	}



	/* Initialize netdevice members */

	macaddr = of_get_mac_address(dn);

	if (!macaddr || !is_valid_ether_addr(macaddr)) {

drivers/net/ethernet/broadcom/bcmsysport.h

+1 −0
Original line number Diff line number Diff line
@@ -656,6 +656,7 @@ struct bcm_sysport_priv { 
	unsigned int		rx_c_index;



	/* PHY device */

	struct device_node	*phy_dn;

	struct phy_device	*phydev;

	phy_interface_t		phy_interface;

	int			old_pause;