ramips: fix at803x patch
authorDavid Bauer <mail@david-bauer.net>
Sun, 18 Apr 2021 12:38:40 +0000 (14:38 +0200)
committerDavid Bauer <mail@david-bauer.net>
Sun, 18 Apr 2021 12:42:06 +0000 (14:42 +0200)
This patch broke while refreshing on a kernel bump. It adds the
config_aneg function twice to the AR8035 PHY now.

Restore the old behavior to restore the patches original intent.

Fixes commit 57e32650efa4 ("kernel: bump 5.10 to 5.10.31")
Signed-off-by: David Bauer <mail@david-bauer.net>
target/linux/ramips/patches-5.10/710-at803x.patch

index cb239325144fa2a6a9f12cb819b394b0cb47d01f..dab62b7607566b596ee5366e198ec32e4507b83d 100644 (file)
@@ -139,11 +139,11 @@ Signed-off-by: RenĂ© van Dorst <opensource@vdorst.com>
        ret = at803x_config_mdix(phydev, phydev->mdix_ctrl);
        if (ret < 0)
                return ret;
-@@ -1083,6 +1166,7 @@ static struct phy_driver at803x_driver[]
-       .suspend                = at803x_suspend,
-       .resume                 = at803x_resume,
-       /* PHY_GBIT_FEATURES */
+@@ -1110,6 +1193,7 @@ static struct phy_driver at803x_driver[]
+       /* Qualcomm Atheros AR8031/AR8033 */
+       PHY_ID_MATCH_EXACT(ATH8031_PHY_ID),
+       .name                   = "Qualcomm Atheros AR8031/AR8033",
 +      .config_aneg            = at803x_config_aneg,
-       .read_status            = at803x_read_status,
-       .ack_interrupt          = at803x_ack_interrupt,
-       .config_intr            = at803x_config_intr,
+       .flags                  = PHY_POLL_CABLE_TEST,
+       .probe                  = at803x_probe,
+       .remove                 = at803x_remove,