ramips: handle mdio address and switch port seperate

[openwrt/staging/dedeckeh.git] / target / linux / ramips / files-4.14 / drivers / net / ethernet / mediatek / mdio.c

diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mdio.c b/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mdio.c
index 2e2da6021fe18caef950a461807af597b854e87c..ce27abf69c147b614a8f1f887f1121077b18d257 100644 (file)
--- a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mdio.c
+++ b/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mdio.c
@@ -60,19 +60,19 @@ static void fe_phy_link_adjust(struct net_device *dev)
        spin_unlock_irqrestore(&priv->phy->lock, flags);
 }
 
-int fe_connect_phy_node(struct fe_priv *priv, struct device_node *phy_node)
+int fe_connect_phy_node(struct fe_priv *priv, struct device_node *phy_node, int port)
 {
-       const __be32 *_port = NULL;
+       const __be32 *_phy_addr = NULL;
        struct phy_device *phydev;
-       int phy_mode, port;
+       int phy_mode;
 
-       _port = of_get_property(phy_node, "reg", NULL);
+       _phy_addr = of_get_property(phy_node, "reg", NULL);
 
-       if (!_port || (be32_to_cpu(*_port) >= 0x20)) {
-               pr_err("%s: invalid port id\n", phy_node->name);
+       if (!_phy_addr || (be32_to_cpu(*_phy_addr) >= 0x20)) {
+               pr_err("%s: invalid phy id\n", phy_node->name);
                return -EINVAL;
        }
-       port = be32_to_cpu(*_port);
+
        phy_mode = of_get_phy_mode(phy_node);
        if (phy_mode < 0) {
                dev_err(priv->dev, "incorrect phy-mode %d\n", phy_mode);