diff options
| author |   Florian Fainelli <f.fainelli@gmail.com> | 2017-06-23 10:33:16 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-06-23 15:06:43 -0400 |
| commit | bedd00c81b30a7c5f1fbe144f2db9c9864073b27 (patch) | |
| tree | 799a1e47b219515bde555e0a269e448bd258c84d /drivers/net/dsa | |
| parent | net: bcmgenet: Remove special handling of "internal" phy-mode (diff) | |
| download | linux-dev-bedd00c81b30a7c5f1fbe144f2db9c9864073b27.tar.xz linux-dev-bedd00c81b30a7c5f1fbe144f2db9c9864073b27.zip | |
net: dsa: bcm_sf2: 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: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dsa')
| -rw-r--r-- | drivers/net/dsa/bcm_sf2.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c index 76e98e8ed315..648f91b58d1e 100644 --- a/drivers/net/dsa/bcm_sf2.c +++ b/drivers/net/dsa/bcm_sf2.c @@ -498,10 +498,8 @@ static void bcm_sf2_identify_ports(struct bcm_sf2_priv *priv, struct device_node *dn) { struct device_node *port; - const char *phy_mode_str; int mode; unsigned int port_num; - int ret; priv->moca_port = -1; @@ -515,15 +513,11 @@ static void bcm_sf2_identify_ports(struct bcm_sf2_priv *priv, * time */ mode = of_get_phy_mode(port); - if (mode < 0) { - ret = of_property_read_string(port, "phy-mode", - &phy_mode_str); - if (ret < 0) - continue; - - if (!strcasecmp(phy_mode_str, "internal")) - priv->int_phy_mask |= 1 << port_num; - } + if (mode < 0) + continue; + + if (mode == PHY_INTERFACE_MODE_INTERNAL) + priv->int_phy_mask |= 1 << port_num; if (mode == PHY_INTERFACE_MODE_MOCA) priv->moca_port = port_num; |