aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/aurora
diff options
context:
space:
mode:
authorSebastian Frias <sf84@laposte.net>2016-02-22 13:33:14 +0100
committerDavid S. Miller <davem@davemloft.net>2016-02-24 11:32:11 -0500
commitc7dfe3abf40ec9a298884a4c0775062eac27afc9 (patch)
tree9d00c677ee7c411524b2e766dd2b567336904a7a /drivers/net/ethernet/aurora
parentbnxt_en: Fix zero padding of tx push data. (diff)
downloadlinux-dev-c7dfe3abf40ec9a298884a4c0775062eac27afc9.tar.xz
linux-dev-c7dfe3abf40ec9a298884a4c0775062eac27afc9.zip
net: ethernet: nb8800: support fixed-link DT node
Under some circumstances, e.g. when connecting to a switch, the ethernet port will not be connected to a PHY. In that case a "fixed-link" DT node can be used to replace it. https://stackoverflow.com/questions/31046172/device-tree-for-phy-less-connection-to-a-dsa-switch This patch adds support for the "fixed-link" node to the nb8800 driver. Signed-off-by: Sebastian Frias <sf84@laposte.net> Acked-by: Mans Rullgard <mans@mansr.com> Cc: Mason <slash.tmp@free.fr> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/aurora')
-rw-r--r--drivers/net/ethernet/aurora/nb8800.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/drivers/net/ethernet/aurora/nb8800.c b/drivers/net/ethernet/aurora/nb8800.c
index f71ab2647a3b..08a23e6b60e9 100644
--- a/drivers/net/ethernet/aurora/nb8800.c
+++ b/drivers/net/ethernet/aurora/nb8800.c
@@ -1460,7 +1460,19 @@ static int nb8800_probe(struct platform_device *pdev)
goto err_disable_clk;
}
- priv->phy_node = of_parse_phandle(pdev->dev.of_node, "phy-handle", 0);
+ if (of_phy_is_fixed_link(pdev->dev.of_node)) {
+ ret = of_phy_register_fixed_link(pdev->dev.of_node);
+ if (ret < 0) {
+ dev_err(&pdev->dev, "bad fixed-link spec\n");
+ goto err_free_bus;
+ }
+ priv->phy_node = of_node_get(pdev->dev.of_node);
+ }
+
+ if (!priv->phy_node)
+ priv->phy_node = of_parse_phandle(pdev->dev.of_node,
+ "phy-handle", 0);
+
if (!priv->phy_node) {
dev_err(&pdev->dev, "no PHY specified\n");
ret = -ENODEV;