kernel: bump 5.15 to 5.15.33

[openwrt/staging/mkresin.git] / target / linux / ramips / patches-5.15 / 710-at803x.patch

diff --git a/target/linux/ramips/patches-5.15/710-at803x.patch b/target/linux/ramips/patches-5.15/710-at803x.patch
index 202e67a605c05bcc3f22bcaf85cd2d22de7441af..2f43e67e3fd577b3d7564ea4b998c1ff8ff937d9 100644 (file)
--- a/target/linux/ramips/patches-5.15/710-at803x.patch
+++ b/target/linux/ramips/patches-5.15/710-at803x.patch
@@ -118,23 +118,7 @@ Signed-off-by: René van Dorst <opensource@vdorst.com>
        priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
        if (!priv)
                return -ENOMEM;
-@@ -674,6 +748,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.
-@@ -685,6 +760,7 @@ static int at803x_probe(struct phy_devic
-               if (ret)
-                       goto err;
-       }
-+#endif
- 
-       return 0;
- 
-@@ -711,6 +787,7 @@ static int at803x_get_features(struct ph
+@@ -693,6 +767,7 @@ static int at803x_get_features(struct ph
        if (err)
                return err;
  
@@ -142,7 +126,7 @@ Signed-off-by: René van Dorst <opensource@vdorst.com>
        if (phydev->drv->phy_id != ATH8031_PHY_ID)
                return 0;
  
-@@ -728,6 +805,7 @@ static int at803x_get_features(struct ph
+@@ -710,6 +785,7 @@ static int at803x_get_features(struct ph
         */
        linkmode_clear_bit(ETHTOOL_LINK_MODE_1000baseX_Full_BIT,
                           phydev->supported);
@@ -150,7 +134,23 @@ Signed-off-by: René van Dorst <opensource@vdorst.com>
        return 0;
  }
  
-@@ -933,6 +1011,10 @@ static int at803x_read_status(struct phy
+@@ -775,6 +851,7 @@ static int at803x_config_init(struct phy
+ {
+       int ret;
+ 
++#if 0
+       if (phydev->drv->phy_id == ATH8031_PHY_ID) {
+               /* Some bootloaders leave the fiber page selected.
+                * Switch to the copper page, as otherwise we read
+@@ -790,6 +867,7 @@ static int at803x_config_init(struct phy
+               if (ret < 0)
+                       return ret;
+       }
++#endif
+ 
+       /* The RX and TX delay default is:
+        *   after HW reset: RX delay enabled and TX delay disabled
+@@ -925,6 +1003,10 @@ static int at803x_read_status(struct phy
  {
        int ss, err, old_link = phydev->link;
  
@@ -161,7 +161,7 @@ Signed-off-by: René van Dorst <opensource@vdorst.com>
        /* Update the link, but return if there was an error */
        err = genphy_update_link(phydev);
        if (err)
-@@ -1033,6 +1115,12 @@ static int at803x_config_aneg(struct phy
+@@ -1025,6 +1107,12 @@ static int at803x_config_aneg(struct phy
  {
        int ret;
  
@@ -174,7 +174,7 @@ Signed-off-by: René van Dorst <opensource@vdorst.com>
        ret = at803x_config_mdix(phydev, phydev->mdix_ctrl);
        if (ret < 0)
                return ret;
-@@ -1445,6 +1533,7 @@ static struct phy_driver at803x_driver[]
+@@ -1437,6 +1525,7 @@ static struct phy_driver at803x_driver[]
        /* Qualcomm Atheros AR8031/AR8033 */
        PHY_ID_MATCH_EXACT(ATH8031_PHY_ID),
        .name                   = "Qualcomm Atheros AR8031/AR8033",