summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/altera
diff options
context:
space:
mode:
authorWalter Lozano <walter@vanguardiasur.com.ar>2014-10-03 20:09:01 +0200
committerDavid S. Miller <davem@davemloft.net>2014-10-06 03:39:40 +0200
commit3354313e504ab51d620388fb230e17cd9097388c (patch)
tree792764c5fde2d532f383d133b9d0b1b045bb0d8e /drivers/net/ethernet/altera
parentAltera TSE: Move PHY get addr and MDIO create (diff)
downloadlinux-3354313e504ab51d620388fb230e17cd9097388c.tar.xz
linux-3354313e504ab51d620388fb230e17cd9097388c.zip
Altera TSE: Add support for no PHY
This patch avoids PHY and MDIO probing if no PHY chip is present. This is the case mainly in optical links where there is no need for PHY chip, and therefore no need of MDIO. In this scenario Ethernet MAC is directly connected to an optical module through an external SFP transceiver. Signed-off-by: Walter Lozano <walter@vanguardiasur.com.ar> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/altera')
-rw-r--r--drivers/net/ethernet/altera/altera_tse_main.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/ethernet/altera/altera_tse_main.c
index 95a30a30f7ff..4efc4355d345 100644
--- a/drivers/net/ethernet/altera/altera_tse_main.c
+++ b/drivers/net/ethernet/altera/altera_tse_main.c
@@ -736,6 +736,10 @@ static int altera_tse_phy_get_addr_mdio_create(struct net_device *dev)
priv->phy_iface = of_get_phy_mode(np);
+ /* Avoid get phy addr and create mdio if no phy is present */
+ if (!priv->phy_iface)
+ return 0;
+
/* try to get PHY address from device tree, use PHY autodetection if
* no valid address is given
*/
@@ -770,6 +774,10 @@ static int init_phy(struct net_device *dev)
struct phy_device *phydev;
struct device_node *phynode;
+ /* Avoid init phy in case of no phy present */
+ if (!priv->phy_iface)
+ return 0;
+
priv->oldlink = 0;
priv->oldspeed = 0;
priv->oldduplex = -1;