generic: 6.1: backport upstream Aquantia PHY firmware loader patches

[openwrt/staging/hauke.git] / target / linux / generic / hack-6.1 / 726-net-phy-aquantia-enable-AQR111-and-AQR111B0.patch

diff --git a/target/linux/generic/hack-6.1/726-net-phy-aquantia-enable-AQR111-and-AQR111B0.patch b/target/linux/generic/hack-6.1/726-net-phy-aquantia-enable-AQR111-and-AQR111B0.patch
index dc25905fee172130e3fc96e33d63b77a622f7078..dbae8f52f4796dd8d6f04a4138ed94c8cdf4524f 100644 (file)
--- a/target/linux/generic/hack-6.1/726-net-phy-aquantia-enable-AQR111-and-AQR111B0.patch
+++ b/target/linux/generic/hack-6.1/726-net-phy-aquantia-enable-AQR111-and-AQR111B0.patch
@@ -10,8 +10,8 @@ This is a 5GbE chip but it reports support for 10G. Implement config_init()
 to set max speed to 5G.
 
 Signed-off-by: Thomas Kupper <thomas.kupper@gmail.com>
---- a/drivers/net/phy/aquantia_main.c
-+++ b/drivers/net/phy/aquantia_main.c
+--- a/drivers/net/phy/aquantia/aquantia_main.c
++++ b/drivers/net/phy/aquantia/aquantia_main.c
 @@ -24,6 +24,8 @@
  #define PHY_ID_AQR405 0x03a1b4b0
  #define PHY_ID_AQR113C        0x31c31c12
@@ -21,7 +21,7 @@ Signed-off-by: Thomas Kupper <thomas.kupper@gmail.com>
  #define PHY_ID_AQR112 0x03a1b662
  #define PHY_ID_AQR412 0x03a1b712
  #define PHY_ID_AQR113 0x31c31c40
-@@ -729,6 +731,34 @@ static int aqcs109_config_init(struct ph
+@@ -674,6 +676,34 @@ static int aqcs109_config_init(struct ph
        return aqr107_set_downshift(phydev, MDIO_AN_VEND_PROV_DOWNSHIFT_DFLT);
  }
  
@@ -56,7 +56,7 @@ Signed-off-by: Thomas Kupper <thomas.kupper@gmail.com>
  static void aqr107_link_change_notify(struct phy_device *phydev)
  {
        u8 fw_major, fw_minor;
-@@ -961,6 +991,42 @@ static struct phy_driver aqr_driver[] =
+@@ -912,6 +942,42 @@ static struct phy_driver aqr_driver[] =
        .link_change_notify = aqr107_link_change_notify,
  },
  {
@@ -99,7 +99,7 @@ Signed-off-by: Thomas Kupper <thomas.kupper@gmail.com>
        PHY_ID_MATCH_MODEL(PHY_ID_AQR112),
        .name           = "Aquantia AQR112",
        .probe          = aqr107_probe,
-@@ -1030,6 +1096,8 @@ static struct mdio_device_id __maybe_unu
+@@ -981,6 +1047,8 @@ static struct mdio_device_id __maybe_unu
        { PHY_ID_MATCH_MODEL(PHY_ID_AQR405) },
        { PHY_ID_MATCH_MODEL(PHY_ID_AQR113C) },
        { PHY_ID_MATCH_MODEL(PHY_ID_AQR813) },