Commit 480ded26 authored by Jeremy Linton's avatar Jeremy Linton Committed by David S. Miller
Browse files

net: bcmgenet: refactor phy mode configuration 



The DT phy mode is similar to what we want for ACPI
lets factor it out of the of path, and change the
of_ call to device_.

Signed-off-by: default avatarJeremy Linton <jeremy.linton@arm.com>
Acked-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ce69e216

drivers/net/ethernet/broadcom/genet/bcmmii.c

+26 −16
Original line number Diff line number Diff line
@@ -477,12 +477,33 @@ out: 
	return ret;

}



static int bcmgenet_phy_interface_init(struct bcmgenet_priv *priv)

{

	struct device *kdev = &priv->pdev->dev;

	int phy_mode = device_get_phy_mode(kdev);



	if (phy_mode < 0) {

		dev_err(kdev, "invalid PHY mode property\n");

		return phy_mode;

	}



	priv->phy_interface = phy_mode;



	/* We need to specifically look up whether this PHY interface is

	 * internal or not *before* we even try to probe the PHY driver

	 * over MDIO as we may have shut down the internal PHY for power

	 * saving purposes.

	 */

	if (priv->phy_interface == PHY_INTERFACE_MODE_INTERNAL)

		priv->internal_phy = true;



	return 0;

}



static int bcmgenet_mii_of_init(struct bcmgenet_priv *priv)

{

	struct device_node *dn = priv->pdev->dev.of_node;

	struct device *kdev = &priv->pdev->dev;

	struct phy_device *phydev;

	phy_interface_t phy_mode;

	int ret;



	/* Fetch the PHY phandle */
@@ -500,23 +521,12 @@ static int bcmgenet_mii_of_init(struct bcmgenet_priv *priv) 
	}



	/* Get the link mode */

	ret = of_get_phy_mode(dn, &phy_mode);

	if (ret) {

		dev_err(kdev, "invalid PHY mode property\n");

	ret = bcmgenet_phy_interface_init(priv);

	if (ret)

		return ret;

	}



	priv->phy_interface = phy_mode;



	/* We need to specifically look up whether this PHY interface is internal

	 * or not *before* we even try to probe the PHY driver over MDIO as we

	 * may have shut down the internal PHY for power saving purposes.

	 */

	if (priv->phy_interface == PHY_INTERFACE_MODE_INTERNAL)

		priv->internal_phy = true;



	/* Make sure we initialize MoCA PHYs with a link down */

	if (phy_mode == PHY_INTERFACE_MODE_MOCA) {

	if (priv->phy_interface == PHY_INTERFACE_MODE_MOCA) {

		phydev = of_phy_find_device(dn);

		if (phydev) {

			phydev->link = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE