@@ -4,8 +4,8 @@ Required properties:
- compatible: should be "marvell,armada-370-neta".
- reg: address and length of the register set for the device.
- interrupts: interrupt for the device
-- phy: A phandle to a phy node defining the PHY address (as the reg
- property, a single integer).
+- phy: A phandle to the PHY node describing the PHY to which this
+ Ethernet controller is connected to.
- phy-mode: The interface between the SoC and the PHY (a string that
of_get_phy_mode() can understand)
- clocks: a pointer to the reference clock for this device.
@@ -2805,10 +2805,12 @@ static int mvneta_probe(struct platform_device *pdev)
}
phy_node = of_parse_phandle(dn, "phy", 0);
- if (!phy_node) {
- dev_err(&pdev->dev, "no associated PHY\n");
- err = -ENODEV;
- goto err_free_irq;
+ if (of_phy_is_fixed_link(phy_node)) {
+ err = of_phy_register_fixed_link(phy_node);
+ if (err < 0) {
+ dev_err(&pdev->dev, "cannot register fixed PHY\n");
+ goto err_free_irq;
+ }
}
phy_mode = of_get_phy_mode(dn);
Following the introduction of of_phy_register_fixed_link(), this patch introduces fixed link support in the mvneta driver, for Marvell Armada 370/XP SOCs. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- .../devicetree/bindings/net/marvell-armada-370-neta.txt | 4 ++-- drivers/net/ethernet/marvell/mvneta.c | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-)