ath79: drop platform data patches
authorMathias Kresin <dev@kresin.me>
Fri, 6 Apr 2018 19:27:30 +0000 (21:27 +0200)
committerMathias Kresin <dev@kresin.me>
Thu, 17 May 2018 05:40:19 +0000 (07:40 +0200)
Signed-off-by: Mathias Kresin <dev@kresin.me>
target/linux/ath79/patches-4.14/902-at803x-add-reset-gpio-pdata.patch [deleted file]

diff --git a/target/linux/ath79/patches-4.14/902-at803x-add-reset-gpio-pdata.patch b/target/linux/ath79/patches-4.14/902-at803x-add-reset-gpio-pdata.patch
deleted file mode 100644 (file)
index cb3ed89..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-Add support for configuring AT803x GPIO reset via platform data.
-This is necessary, because ath79 is not converted to device tree yet.
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
-
---- a/include/linux/platform_data/phy-at803x.h
-+++ b/include/linux/platform_data/phy-at803x.h
-@@ -6,6 +6,8 @@ struct at803x_platform_data {
-       int enable_rgmii_tx_delay:1;
-       int enable_rgmii_rx_delay:1;
-       int fixup_rgmii_tx_delay:1;
-+      int has_reset_gpio:1;
-+      int reset_gpio;
- };
- #endif /* _PHY_AT803X_PDATA_H */
---- a/drivers/net/phy/at803x.c
-+++ b/drivers/net/phy/at803x.c
-@@ -264,6 +264,7 @@ static int at803x_resume(struct phy_devi
- static int at803x_probe(struct phy_device *phydev)
- {
-+      struct at803x_platform_data *pdata;
-       struct device *dev = &phydev->mdio.dev;
-       struct at803x_priv *priv;
-       struct gpio_desc *gpiod_reset;
-@@ -276,6 +277,12 @@ static int at803x_probe(struct phy_devic
-           phydev->drv->phy_id != ATH8032_PHY_ID)
-               goto does_not_require_reset_workaround;
-+      pdata = dev_get_platdata(dev);
-+      if (pdata && pdata->has_reset_gpio) {
-+              devm_gpio_request(dev, pdata->reset_gpio, "reset");
-+              gpio_direction_output(pdata->reset_gpio, 1);
-+      }
-+
-       gpiod_reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW);
-       if (IS_ERR(gpiod_reset))
-               return PTR_ERR(gpiod_reset);
-@@ -407,15 +414,23 @@ static void at803x_link_change_notify(st
-        * cannot recover from by software.
-        */
-       if (phydev->state == PHY_NOLINK) {
--              if (priv->gpiod_reset && !priv->phy_reset) {
-+              if ((priv->gpiod_reset || (pdata && pdata->has_reset_gpio)) &&
-+                  !priv->phy_reset) {
-                       struct at803x_context context;
-                       at803x_context_save(phydev, &context);
--                      gpiod_set_value(priv->gpiod_reset, 1);
--                      msleep(1);
--                      gpiod_set_value(priv->gpiod_reset, 0);
--                      msleep(1);
-+                      if (pdata && pdata->has_reset_gpio) {
-+                              gpio_set_value_cansleep(pdata->reset_gpio, 0);
-+                              msleep(1);
-+                              gpio_set_value_cansleep(pdata->reset_gpio, 1);
-+                              msleep(1);
-+                      } else {
-+                              gpiod_set_value(priv->gpiod_reset, 1);
-+                              msleep(1);
-+                              gpiod_set_value(priv->gpiod_reset, 0);
-+                              msleep(1);
-+                      }
-                       at803x_context_restore(phydev, &context);