kernel: 5.15: backport v6.1 PHY changes required for Aquantia

[openwrt/staging/jow.git] / target / linux / generic / backport-5.15 / 815-v6.4-05-net-phy-Add-a-binding-for-PHY-LEDs.patch

diff --git a/target/linux/generic/backport-5.15/815-v6.4-05-net-phy-Add-a-binding-for-PHY-LEDs.patch b/target/linux/generic/backport-5.15/815-v6.4-05-net-phy-Add-a-binding-for-PHY-LEDs.patch
index 3e60f91a2a9d4b65b9ab48fd4a8e236ec9dbdba2..6e5ac8b249e486aa65f2616be171d881c417ac2f 100644 (file)
--- a/target/linux/generic/backport-5.15/815-v6.4-05-net-phy-Add-a-binding-for-PHY-LEDs.patch
+++ b/target/linux/generic/backport-5.15/815-v6.4-05-net-phy-Add-a-binding-for-PHY-LEDs.patch
@@ -153,7 +153,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  #include <linux/linkmode.h>
  #include <linux/netlink.h>
  #include <linux/mdio.h>
-@@ -582,6 +583,7 @@ struct macsec_ops;
+@@ -590,6 +591,7 @@ struct macsec_ops;
   * @phy_num_led_triggers: Number of triggers in @phy_led_triggers
   * @led_link_trigger: LED trigger for link up/down
   * @last_triggered: last LED trigger for link speed
@@ -161,7 +161,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
   * @master_slave_set: User requested master/slave configuration
   * @master_slave_get: Current master/slave advertisement
   * @master_slave_state: Current master/slave configuration
-@@ -668,6 +670,7 @@ struct phy_device {
+@@ -678,6 +680,7 @@ struct phy_device {
  
        struct phy_led_trigger *led_link_trigger;
  #endif
@@ -169,7 +169,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
        /*
         * Interrupt number for this PHY
-@@ -739,6 +742,19 @@ struct phy_tdr_config {
+@@ -749,6 +752,19 @@ struct phy_tdr_config {
  #define PHY_PAIR_ALL -1
  
  /**