Changeset 36059

Timestamp:

2013-03-16T23:25:41+01:00 (5 years ago)

Author:

florian

Message:

mcs814x: use the standard device tree binding to represent a PHY node

Signed-off-by: Florian Fainelli <florian@…>

Location:

trunk/target/linux/mcs814x/files-3.3

Files:

• arch/arm/boot/dts/dlan-usb-extender.dts (modified) (1 diff)
• arch/arm/boot/dts/mcs8140.dtsi (modified) (1 diff)
• arch/arm/boot/dts/rbt-832.dts (modified) (1 diff)
• drivers/net/ethernet/mcs8140/nuport_mac.c (modified) (5 diffs)

trunk/target/linux/mcs814x/files-3.3/arch/arm/boot/dts/dlan-usb-extender.dts

@@ -20 +20 @@
         ahb {
                 vci {
+                        eth0: ethernet@40084000 {
+                                phy = <&phy0>;
+                                phy-mode = "mii";
+
+                                phy0: ethernet-phy@0 {
+                                        reg = <8>;
+                                };
+                        };
 
                         adc {

trunk/target/linux/mcs814x/files-3.3/arch/arm/boot/dts/mcs8140.dtsi

@@ -38 +38 @@
 
                         eth0: ethernet@40084000 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
                                 compatible = "moschip,nuport-mac";
                                 reg = <0x40084000 0xd8          // mac

trunk/target/linux/mcs814x/files-3.3/arch/arm/boot/dts/rbt-832.dts

@@ -22 +22 @@
                         eth0: ethernet@40084000 {
                                 nuport-mac,link-activity = <0x01>;
+                                phy = <&phy0>;
+                                phy-mode = "mii";
+
+                                phy0: ethernet-phy@0 {
+                                        reg = <1>;
+                                };
                         };
 

trunk/target/linux/mcs814x/files-3.3/drivers/net/ethernet/mcs8140/nuport_mac.c

@@ -20 +20 @@
 #include <linux/platform_device.h>
 #include <linux/of.h>
+#include <linux/of_mdio.h>
+#include <linux/of_net.h>
 #include <linux/irq.h>
 #include <linux/err.h>
@@ -169 +171 @@
         struct mii_bus          *mii_bus;
         struct phy_device       *phydev;
+        struct device_node      *phy_node;
+        phy_interface_t         phy_interface;
         int                     old_link;
         int                     old_duplex;
@@ -899 +903 @@
         }
 
-        phydev = phy_connect(dev, dev_name(&phydev->dev),
+        phydev = of_phy_connect(dev, priv->phy_node,
                         nuport_mac_adjust_link, 0,
-                        PHY_INTERFACE_MODE_MII);
+                        priv->phy_interface);
         if (IS_ERR(phydev)) {
                 netdev_err(dev, "could not attach PHY\n");
@@ -1082 +1086 @@
 
         netif_napi_add(dev, &priv->napi, nuport_mac_poll, 64);
+
+        priv->phy_node = of_parse_phandle(pdev->dev.of_node, "phy", 0);
+        if (!priv->phy_node) {
+                dev_err(&pdev->dev, "no associated PHY\n");
+                ret = -ENODEV;
+                goto out;
+        }
+
+        priv->phy_interface = of_get_phy_mode(pdev->dev.of_node);
+        if (priv->phy_interface < 0) {
+                dev_err(&pdev->dev, "invalid PHY mode\n");
+                ret = -EINVAL;
+                goto out;
+        }
 
         priv->mii_bus = mdiobus_alloc();
@@ -1107 +1125 @@
                 priv->mii_bus->irq[i] = PHY_IGNORE_INTERRUPT;
 
-        ret = mdiobus_register(priv->mii_bus);
+        ret = of_mdiobus_register(priv->mii_bus, pdev->dev.of_node);
         if (ret) {
                 dev_err(&pdev->dev, "failed to register mii_bus\n");