kernel: bump 4.19 to 4.19.62

[openwrt/staging/lynxis.git] / target / linux / mvebu / patches-4.19 / 450-reprobe_sfp_phy.patch

diff --git a/target/linux/mvebu/patches-4.19/450-reprobe_sfp_phy.patch b/target/linux/mvebu/patches-4.19/450-reprobe_sfp_phy.patch
index bec8b4c1e616f0b657a636249a4b348cc493e909..833c515a111fecbe432216f586799ce4f3dbd701 100644 (file)
--- a/target/linux/mvebu/patches-4.19/450-reprobe_sfp_phy.patch
+++ b/target/linux/mvebu/patches-4.19/450-reprobe_sfp_phy.patch
@@ -13,7 +13,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 
 --- a/drivers/net/phy/sfp.c
 +++ b/drivers/net/phy/sfp.c
-@@ -1373,7 +1373,7 @@ static void sfp_sm_phy_detach(struct sfp
+@@ -1374,7 +1374,7 @@ static void sfp_sm_phy_detach(struct sfp
        sfp->mod_phy = NULL;
  }
  
@@ -22,7 +22,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
  {
        struct phy_device *phy;
        int err;
-@@ -1383,11 +1383,11 @@ static void sfp_sm_probe_phy(struct sfp
+@@ -1384,11 +1384,11 @@ static void sfp_sm_probe_phy(struct sfp
        phy = mdiobus_scan(sfp->i2c_mii, SFP_PHY_ADDR);
        if (phy == ERR_PTR(-ENODEV)) {
                dev_info(sfp->dev, "no PHY detected\n");
@@ -36,7 +36,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
        }
  
        err = sfp_add_phy(sfp->sfp_bus, phy);
-@@ -1395,11 +1395,13 @@ static void sfp_sm_probe_phy(struct sfp
+@@ -1396,11 +1396,13 @@ static void sfp_sm_probe_phy(struct sfp
                phy_device_remove(phy);
                phy_device_free(phy);
                dev_err(sfp->dev, "sfp_add_phy failed: %d\n", err);
@@ -51,7 +51,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
  }
  
  static void sfp_sm_link_up(struct sfp *sfp)
-@@ -1463,14 +1465,9 @@ static void sfp_sm_fault(struct sfp *sfp
+@@ -1464,14 +1466,9 @@ static void sfp_sm_fault(struct sfp *sfp
  
  static void sfp_sm_mod_init(struct sfp *sfp)
  {
@@ -68,7 +68,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
  
        /* Setting the serdes link mode is guesswork: there's no
         * field in the EEPROM which indicates what mode should
-@@ -1484,7 +1481,22 @@ static void sfp_sm_mod_init(struct sfp *
+@@ -1485,7 +1482,22 @@ static void sfp_sm_mod_init(struct sfp *
        if (sfp->id.base.e1000_base_t ||
            sfp->id.base.e100_base_lx ||
            sfp->id.base.e100_base_fx)