mips: fix dynamic ftrace

[openwrt/openwrt.git] / target / linux / generic / pending-4.9 / 734-net-phy-at803x-allow-to-configure-via-pdata.patch

diff --git a/target/linux/generic/pending-4.9/734-net-phy-at803x-allow-to-configure-via-pdata.patch b/target/linux/generic/pending-4.9/734-net-phy-at803x-allow-to-configure-via-pdata.patch
index e996d9509307bf3498532124bdcc6424444a9ee4..8bd9ce3bf77da88e152e63cc6ef6e8ff3a4f516d 100644 (file)
--- a/target/linux/generic/pending-4.9/734-net-phy-at803x-allow-to-configure-via-pdata.patch
+++ b/target/linux/generic/pending-4.9/734-net-phy-at803x-allow-to-configure-via-pdata.patch
@@ -11,8 +11,6 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
  2 files changed, 67 insertions(+)
  create mode 100644 include/linux/platform_data/phy-at803x.h
 
-diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
-index c0f45dde60aa..4a55130dcb1c 100644
 --- a/drivers/net/phy/at803x.c
 +++ b/drivers/net/phy/at803x.c
 @@ -12,12 +12,14 @@
@@ -42,7 +40,7 @@ index c0f45dde60aa..4a55130dcb1c 100644
  #define AT803X_DEBUG_ADDR                     0x1D
  #define AT803X_DEBUG_DATA                     0x1E
  
-@@ -72,6 +79,7 @@ MODULE_LICENSE("GPL");
+@@ -71,6 +78,7 @@ MODULE_LICENSE("GPL");
  struct at803x_priv {
        bool phy_reset:1;
        struct gpio_desc *gpiod_reset;
@@ -50,7 +48,7 @@ index c0f45dde60aa..4a55130dcb1c 100644
  };
  
  struct at803x_context {
-@@ -276,8 +284,16 @@ static int at803x_probe(struct phy_device *phydev)
+@@ -274,8 +282,16 @@ does_not_require_reset_workaround:
        return 0;
  }
  
@@ -67,7 +65,7 @@ index c0f45dde60aa..4a55130dcb1c 100644
        int ret;
  
        ret = genphy_config_init(phydev);
-@@ -298,6 +314,26 @@ static int at803x_config_init(struct phy_device *phydev)
+@@ -296,6 +312,26 @@ static int at803x_config_init(struct phy
                        return ret;
        }
  
@@ -94,7 +92,7 @@ index c0f45dde60aa..4a55130dcb1c 100644
        return 0;
  }
  
-@@ -335,6 +371,8 @@ static int at803x_config_intr(struct phy_device *phydev)
+@@ -333,6 +369,8 @@ static int at803x_config_intr(struct phy
  static void at803x_link_change_notify(struct phy_device *phydev)
  {
        struct at803x_priv *priv = phydev->priv;
@@ -102,8 +100,8 @@ index c0f45dde60aa..4a55130dcb1c 100644
 +      pdata = dev_get_platdata(&phydev->mdio.dev);
  
        /*
-        * Conduct a hardware reset for AT8030/2 every time a link loss is
-@@ -363,6 +401,24 @@ static void at803x_link_change_notify(struct phy_device *phydev)
+        * Conduct a hardware reset for AT8030 every time a link loss is
+@@ -361,6 +399,24 @@ static void at803x_link_change_notify(st
        } else {
                priv->phy_reset = false;
        }
@@ -128,9 +126,6 @@ index c0f45dde60aa..4a55130dcb1c 100644
  }
  
  static int at803x_aneg_done(struct phy_device *phydev)
-diff --git a/include/linux/platform_data/phy-at803x.h b/include/linux/platform_data/phy-at803x.h
-new file mode 100644
-index 000000000000..a5df74b4f38d
 --- /dev/null
 +++ b/include/linux/platform_data/phy-at803x.h
 @@ -0,0 +1,11 @@
@@ -145,6 +140,3 @@ index 000000000000..a5df74b4f38d
 +};
 +
 +#endif /* _PHY_AT803X_PDATA_H */
--- 
-2.11.0
-