Commit 40bc8b06 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller

net: bcmgenet: Remove special handling of "internal" phy-mode

The PHY library now supports an "internal" phy-mode, thus making our
custom parsing code now unnecessary.
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 735d8a18
...@@ -251,11 +251,8 @@ int bcmgenet_mii_config(struct net_device *dev) ...@@ -251,11 +251,8 @@ int bcmgenet_mii_config(struct net_device *dev)
priv->ext_phy = !priv->internal_phy && priv->ext_phy = !priv->internal_phy &&
(priv->phy_interface != PHY_INTERFACE_MODE_MOCA); (priv->phy_interface != PHY_INTERFACE_MODE_MOCA);
if (priv->internal_phy)
priv->phy_interface = PHY_INTERFACE_MODE_NA;
switch (priv->phy_interface) { switch (priv->phy_interface) {
case PHY_INTERFACE_MODE_NA: case PHY_INTERFACE_MODE_INTERNAL:
case PHY_INTERFACE_MODE_MOCA: case PHY_INTERFACE_MODE_MOCA:
/* Irrespective of the actually configured PHY speed (100 or /* Irrespective of the actually configured PHY speed (100 or
* 1000) GENETv4 only has an internal GPHY so we will just end * 1000) GENETv4 only has an internal GPHY so we will just end
...@@ -471,7 +468,6 @@ static int bcmgenet_mii_of_init(struct bcmgenet_priv *priv) ...@@ -471,7 +468,6 @@ static int bcmgenet_mii_of_init(struct bcmgenet_priv *priv)
{ {
struct device_node *dn = priv->pdev->dev.of_node; struct device_node *dn = priv->pdev->dev.of_node;
struct device *kdev = &priv->pdev->dev; struct device *kdev = &priv->pdev->dev;
const char *phy_mode_str = NULL;
struct phy_device *phydev = NULL; struct phy_device *phydev = NULL;
char *compat; char *compat;
int phy_mode; int phy_mode;
...@@ -510,23 +506,19 @@ static int bcmgenet_mii_of_init(struct bcmgenet_priv *priv) ...@@ -510,23 +506,19 @@ static int bcmgenet_mii_of_init(struct bcmgenet_priv *priv)
/* Get the link mode */ /* Get the link mode */
phy_mode = of_get_phy_mode(dn); phy_mode = of_get_phy_mode(dn);
if (phy_mode < 0) {
dev_err(kdev, "invalid PHY mode property\n");
return phy_mode;
}
priv->phy_interface = phy_mode; priv->phy_interface = phy_mode;
/* We need to specifically look up whether this PHY interface is internal /* 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 * 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. * may have shut down the internal PHY for power saving purposes.
*/ */
if (phy_mode < 0) { if (priv->phy_interface == PHY_INTERFACE_MODE_INTERNAL)
ret = of_property_read_string(dn, "phy-mode", &phy_mode_str);
if (ret < 0) {
dev_err(kdev, "invalid PHY mode property\n");
return ret;
}
priv->phy_interface = PHY_INTERFACE_MODE_NA;
if (!strcasecmp(phy_mode_str, "internal"))
priv->internal_phy = true; priv->internal_phy = true;
}
/* Make sure we initialize MoCA PHYs with a link down */ /* Make sure we initialize MoCA PHYs with a link down */
if (phy_mode == PHY_INTERFACE_MODE_MOCA) { if (phy_mode == PHY_INTERFACE_MODE_MOCA) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment