MLK-21052-04 net: phy: at803x: Fix build failure by removing gpiod_reset again
authorLeonard Crestez <leonard.crestez@nxp.com>
Wed, 27 Feb 2019 19:35:38 +0000 (21:35 +0200)
committerLeonard Crestez <leonard.crestez@nxp.com>
Wed, 17 Apr 2019 23:51:34 +0000 (02:51 +0300)
Upstream removed this in commit bafbdd527d56 ("phylib: Add device reset
GPIO support") but it was added by mistake while backporting in a way
that breaks arm64 build.

Fixes: 0c27b23fd1b1 ("MLK-15309-01 net: phy: at803x: add EEE mode, 1.8V IO, led_act blinding workaround support")

This phy driver is used on imx8 mek boards.

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
drivers/net/phy/at803x.c

index d3063d3..63cad73 100644 (file)
@@ -85,7 +85,6 @@ MODULE_LICENSE("GPL");
 
 struct at803x_priv {
        bool phy_reset:1;
-       struct gpio_desc *gpiod_reset;
        u32 quirks;
 };
 
@@ -310,16 +309,6 @@ static int at803x_probe(struct phy_device *phydev)
        if (of_property_read_bool(dev->of_node, "at803x,vddio-1p8v"))
                priv->quirks |= AT803X_VDDIO_1P8V;
 
-       if (phydev->drv->phy_id != ATH8030_PHY_ID)
-               goto does_not_require_reset_workaround;
-
-       gpiod_reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW);
-       if (IS_ERR(gpiod_reset))
-               return PTR_ERR(gpiod_reset);
-
-       priv->gpiod_reset = gpiod_reset;
-
-does_not_require_reset_workaround:
        phydev->priv = priv;
 
        return 0;