diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-02-27 16:59:49 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-03-06 12:51:52 +0100 |
| commit | 810ee3b84a2b4399676a1799a25e34211bda7d60 (patch) | |
| tree | fca2ad04fed6a76b5030bb06f0121c9f638faefb /target/linux/mvebu/patches-4.14/450-reprobe_sfp_phy.patch | |
| parent | 5183df0dbf5f6b81c711b81e399a8c1be62bb838 (diff) | |
| download | upstream-810ee3b84a2b4399676a1799a25e34211bda7d60.tar.gz upstream-810ee3b84a2b4399676a1799a25e34211bda7d60.tar.bz2 upstream-810ee3b84a2b4399676a1799a25e34211bda7d60.zip | |
kernel: bump 4.14 to 4.14.104
Refreshed all patches.
Altered patches:
- 332-arc-add-OWRTDTB-section.patch
Compile-tested on: cns3xxx, imx6
Runtime-tested on: cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/mvebu/patches-4.14/450-reprobe_sfp_phy.patch')
| -rw-r--r-- | target/linux/mvebu/patches-4.14/450-reprobe_sfp_phy.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/mvebu/patches-4.14/450-reprobe_sfp_phy.patch b/target/linux/mvebu/patches-4.14/450-reprobe_sfp_phy.patch index e9a3d695da..e05d5ad47c 100644 --- a/target/linux/mvebu/patches-4.14/450-reprobe_sfp_phy.patch +++ b/target/linux/mvebu/patches-4.14/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 -@@ -488,7 +488,7 @@ static void sfp_sm_phy_detach(struct sfp +@@ -489,7 +489,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; -@@ -498,11 +498,11 @@ static void sfp_sm_probe_phy(struct sfp +@@ -499,11 +499,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); -@@ -510,11 +510,13 @@ static void sfp_sm_probe_phy(struct sfp +@@ -511,11 +511,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) -@@ -560,14 +562,9 @@ static void sfp_sm_fault(struct sfp *sfp +@@ -561,14 +563,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 -@@ -581,7 +578,22 @@ static void sfp_sm_mod_init(struct sfp * +@@ -582,7 +579,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) |