diff --git a/target/linux/ramips/patches-5.10/710-at803x.patch b/target/linux/ramips/patches-5.10/710-at803x.patch index d15dd92965..ec8f3ba55f 100644 --- a/target/linux/ramips/patches-5.10/710-at803x.patch +++ b/target/linux/ramips/patches-5.10/710-at803x.patch @@ -118,7 +118,23 @@ Signed-off-by: René van Dorst priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); if (!priv) return -ENOMEM; -@@ -744,6 +818,10 @@ static int at803x_read_status(struct phy +@@ -554,6 +628,7 @@ static int at803x_probe(struct phy_devic + return ret; + } + ++#if 0 + /* Some bootloaders leave the fiber page selected. + * Switch to the copper page, as otherwise we read + * the PHY capabilities from the fiber side. +@@ -565,6 +640,7 @@ static int at803x_probe(struct phy_devic + if (ret) + goto err; + } ++#endif + + return 0; + +@@ -744,6 +820,10 @@ static int at803x_read_status(struct phy { int ss, err, old_link = phydev->link; @@ -129,7 +145,7 @@ Signed-off-by: René van Dorst /* Update the link, but return if there was an error */ err = genphy_update_link(phydev); if (err) -@@ -844,6 +922,12 @@ static int at803x_config_aneg(struct phy +@@ -844,6 +924,12 @@ static int at803x_config_aneg(struct phy { int ret; @@ -142,7 +158,23 @@ Signed-off-by: René van Dorst ret = at803x_config_mdix(phydev, phydev->mdix_ctrl); if (ret < 0) return ret; -@@ -1145,6 +1229,7 @@ static struct phy_driver at803x_driver[] +@@ -943,6 +1029,7 @@ static int at803x_get_features(struct ph + if (err) + return err; + ++#if 0 + if (!at803x_match_phy_id(phydev, ATH8031_PHY_ID)) + return 0; + +@@ -960,6 +1047,7 @@ static int at803x_get_features(struct ph + */ + linkmode_clear_bit(ETHTOOL_LINK_MODE_1000baseX_Full_BIT, + phydev->supported); ++#endif + return 0; + } + +@@ -1173,6 +1261,7 @@ static struct phy_driver at803x_driver[] /* Qualcomm Atheros AR8031/AR8033 */ PHY_ID_MATCH_EXACT(ATH8031_PHY_ID), .name = "Qualcomm Atheros AR8031/AR8033", diff --git a/target/linux/ramips/patches-5.4/991-at803x.patch b/target/linux/ramips/patches-5.4/991-at803x.patch index 4de3118547..a0d9a03fcf 100644 --- a/target/linux/ramips/patches-5.4/991-at803x.patch +++ b/target/linux/ramips/patches-5.4/991-at803x.patch @@ -42,7 +42,7 @@ Signed-off-by: René van Dorst #define AT803X_DEBUG_REG_0 0x00 #define AT803X_DEBUG_RX_CLK_DLY_EN BIT(15) -@@ -274,12 +285,73 @@ static int at803x_resume(struct phy_devi +@@ -274,18 +285,80 @@ static int at803x_resume(struct phy_devi return phy_modify(phydev, MII_BMCR, BMCR_PDOWN | BMCR_ISOLATE, 0); } @@ -116,7 +116,38 @@ Signed-off-by: René van Dorst priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); if (!priv) return -ENOMEM; -@@ -415,6 +487,10 @@ static int at803x_read_status(struct phy + + phydev->priv = priv; + ++#if 0 + /* Some bootloaders leave the fiber page selected. + * Switch to the copper page, as otherwise we read + * the PHY capabilities from the fiber side. +@@ -295,6 +368,7 @@ static int at803x_probe(struct phy_devic + ret = at803x_write_page(phydev, AT803X_PAGE_COPPER); + mutex_unlock(&phydev->mdio.bus->mdio_lock); + } ++#endif + + return ret; + } +@@ -419,6 +493,7 @@ static int at803x_get_features(struct ph + if (err) + return err; + ++#if 0 + if (!(phydev->phy_id & phydev->drv->phy_id_mask) == (ATH8031_PHY_ID & phydev->drv->phy_id_mask)) + return 0; + +@@ -436,6 +511,7 @@ static int at803x_get_features(struct ph + */ + linkmode_clear_bit(ETHTOOL_LINK_MODE_1000baseX_Full_BIT, + phydev->supported); ++#endif + return 0; + } + +@@ -443,6 +519,10 @@ static int at803x_read_status(struct phy { int ss, err, old_link = phydev->link; @@ -127,7 +158,7 @@ Signed-off-by: René van Dorst /* Update the link, but return if there was an error */ err = genphy_update_link(phydev); if (err) -@@ -469,6 +545,19 @@ static int at803x_read_status(struct phy +@@ -497,6 +577,19 @@ static int at803x_read_status(struct phy return 0; } @@ -147,7 +178,7 @@ Signed-off-by: René van Dorst static struct phy_driver at803x_driver[] = { { /* ATHEROS 8035 */ -@@ -504,6 +593,7 @@ static struct phy_driver at803x_driver[] +@@ -532,6 +625,7 @@ static struct phy_driver at803x_driver[] /* ATHEROS 8031 */ .phy_id = ATH8031_PHY_ID, .name = "Atheros 8031 ethernet",