generic: 5.10: replace pending 730-net-phy-at803x-fix... with upstream

[openwrt/openwrt.git] / target / linux / generic / backport-5.10 / 746-v5.16-04-net-phy-at803x-better-describe-debug-regs.patch

diff --git a/target/linux/generic/backport-5.10/746-v5.16-04-net-phy-at803x-better-describe-debug-regs.patch b/target/linux/generic/backport-5.10/746-v5.16-04-net-phy-at803x-better-describe-debug-regs.patch
index 9c28a893f16c1d524b019fc4a704e6a029144115..f54dc4276a4b7ced5f458cb75293aaae384ec495 100644 (file)
--- a/target/linux/generic/backport-5.10/746-v5.16-04-net-phy-at803x-better-describe-debug-regs.patch
+++ b/target/linux/generic/backport-5.10/746-v5.16-04-net-phy-at803x-better-describe-debug-regs.patch
@@ -69,7 +69,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                                     AT803X_DEBUG_TX_CLK_DLY_EN, 0);
  }
  
-@@ -1208,9 +1208,9 @@ static int qca83xx_config_init(struct ph
+@@ -1236,9 +1236,9 @@ static int qca83xx_config_init(struct ph
        switch (switch_revision) {
        case 1:
                /* For 100M waveform */
@@ -81,7 +81,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                break;
  
        case 2:
-@@ -1218,8 +1218,8 @@ static int qca83xx_config_init(struct ph
+@@ -1246,8 +1246,8 @@ static int qca83xx_config_init(struct ph
                fallthrough;
        case 4:
                phy_write_mmd(phydev, MDIO_MMD_PCS, MDIO_AZ_DEBUG, 0x803f);
@@ -92,7 +92,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                at803x_debug_reg_write(phydev, AT803X_DEBUG_REG_3C, 0x6000);
                break;
        }
-@@ -1230,7 +1230,7 @@ static int qca83xx_config_init(struct ph
+@@ -1258,7 +1258,7 @@ static int qca83xx_config_init(struct ph
         */
        if (phydev->drv->phy_id == QCA8327_A_PHY_ID ||
            phydev->drv->phy_id == QCA8327_B_PHY_ID)
@@ -101,7 +101,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                                      QCA8327_DEBUG_MANU_CTRL_EN, 0);
  
        /* Following original QCA sourcecode set port to prefer master */
-@@ -1248,12 +1248,12 @@ static void qca83xx_link_change_notify(s
+@@ -1276,12 +1276,12 @@ static void qca83xx_link_change_notify(s
        /* Set DAC Amplitude adjustment to +6% for 100m on link running */
        if (phydev->state == PHY_RUNNING) {
                if (phydev->speed == SPEED_100)
@@ -116,7 +116,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                                      QCA8327_DEBUG_MANU_CTRL_EN, 0);
        }
  }
-@@ -1300,7 +1300,7 @@ static int qca83xx_suspend(struct phy_de
+@@ -1328,7 +1328,7 @@ static int qca83xx_suspend(struct phy_de
                phy_modify(phydev, MII_BMCR, mask, 0);
        }