kernel: bump 5.10 to 5.10.92

[openwrt/staging/jow.git] / target / linux / generic / backport-5.10 / 851-v5.15-0001-phy-marvell-phy-mvebu-a3700-comphy-Rename-HS-SGMMI-t.patch

diff --git a/target/linux/generic/backport-5.10/851-v5.15-0001-phy-marvell-phy-mvebu-a3700-comphy-Rename-HS-SGMMI-t.patch b/target/linux/generic/backport-5.10/851-v5.15-0001-phy-marvell-phy-mvebu-a3700-comphy-Rename-HS-SGMMI-t.patch
index 53e7b86af427c7480be6b16a003c9e183c4f3cc8..4f867724ac23bad584dcb7cb0b5f7ca6dcb2ddf4 100644 (file)
--- a/target/linux/generic/backport-5.10/851-v5.15-0001-phy-marvell-phy-mvebu-a3700-comphy-Rename-HS-SGMMI-t.patch
+++ b/target/linux/generic/backport-5.10/851-v5.15-0001-phy-marvell-phy-mvebu-a3700-comphy-Rename-HS-SGMMI-t.patch
@@ -19,8 +19,6 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  drivers/phy/marvell/phy-mvebu-a3700-comphy.c | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
-diff --git a/drivers/phy/marvell/phy-mvebu-a3700-comphy.c b/drivers/phy/marvell/phy-mvebu-a3700-comphy.c
-index 810f25a47632..cc534a5c4b3b 100644
 --- a/drivers/phy/marvell/phy-mvebu-a3700-comphy.c
 +++ b/drivers/phy/marvell/phy-mvebu-a3700-comphy.c
 @@ -29,7 +29,7 @@
@@ -41,7 +39,7 @@ index 810f25a47632..cc534a5c4b3b 100644
  #define COMPHY_FW_SPEED_5G                    3
  #define COMPHY_FW_SPEED_5_15625G              4 /* XFI 5G */
  #define COMPHY_FW_SPEED_6G                    5
-@@ -84,14 +84,14 @@ static const struct mvebu_a3700_comphy_conf mvebu_a3700_comphy_modes[] = {
+@@ -84,14 +84,14 @@ static const struct mvebu_a3700_comphy_c
        MVEBU_A3700_COMPHY_CONF_ETH(0, PHY_INTERFACE_MODE_SGMII, 1,
                                    COMPHY_FW_MODE_SGMII),
        MVEBU_A3700_COMPHY_CONF_ETH(0, PHY_INTERFACE_MODE_2500BASEX, 1,
@@ -58,7 +56,7 @@ index 810f25a47632..cc534a5c4b3b 100644
        /* lane 2 */
        MVEBU_A3700_COMPHY_CONF_GEN(2, PHY_MODE_SATA, 0,
                                    COMPHY_FW_MODE_SATA),
-@@ -205,7 +205,7 @@ static int mvebu_a3700_comphy_power_on(struct phy *phy)
+@@ -205,7 +205,7 @@ static int mvebu_a3700_comphy_power_on(s
                                                 COMPHY_FW_SPEED_1_25G);
                        break;
                case PHY_INTERFACE_MODE_2500BASEX:
@@ -67,6 +65,3 @@ index 810f25a47632..cc534a5c4b3b 100644
                                lane->id);
                        fw_param = COMPHY_FW_NET(fw_mode, lane->port,
                                                 COMPHY_FW_SPEED_3_125G);
--- 
-2.34.1
-