diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-08-20 10:43:09 +0200 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-08-20 13:03:23 +0200 |
commit | 548182bc6d38a3817c8e9f5b11207043a31c59b9 (patch) | |
tree | 47925b7011e6f85ccac7ce7eb6fae55423778248 /target/linux/generic/pending-3.18/002-phy_drivers_backport.patch | |
parent | 1f7ce19df292dfe3c270091ac0f7edc5bb9a8324 (diff) | |
download | upstream-548182bc6d38a3817c8e9f5b11207043a31c59b9.tar.gz upstream-548182bc6d38a3817c8e9f5b11207043a31c59b9.tar.bz2 upstream-548182bc6d38a3817c8e9f5b11207043a31c59b9.zip |
kernel: bump 3.18 to 3.18.119
Refreshed all patches.
Compile-tested on: adm5120, adm8668, au1000, mcs814x, ppc40x, ppc44x, xburst
Runtime-tested on: none
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/pending-3.18/002-phy_drivers_backport.patch')
-rw-r--r-- | target/linux/generic/pending-3.18/002-phy_drivers_backport.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/generic/pending-3.18/002-phy_drivers_backport.patch b/target/linux/generic/pending-3.18/002-phy_drivers_backport.patch index 504d772def..c500138309 100644 --- a/target/linux/generic/pending-3.18/002-phy_drivers_backport.patch +++ b/target/linux/generic/pending-3.18/002-phy_drivers_backport.patch @@ -95,7 +95,7 @@ ret |= BMCR_ANENABLE | BMCR_ANRESTART; return phy_write(phydev, MII_BMCR, ret); } -@@ -2007,7 +2007,7 @@ ar8xxx_phy_config_init(struct phy_device +@@ -2012,7 +2012,7 @@ ar8xxx_phy_config_init(struct phy_device priv->phy = phydev; @@ -104,7 +104,7 @@ if (chip_is_ar8316(priv)) { /* switch device has been initialized, reinit */ priv->dev.ports = (AR8216_NUM_PORTS - 1); -@@ -2055,7 +2055,7 @@ ar8xxx_check_link_states(struct ar8xxx_p +@@ -2060,7 +2060,7 @@ ar8xxx_check_link_states(struct ar8xxx_p /* flush ARL entries for this port if it went down*/ if (!link_new) priv->chip->atu_flush_port(priv, i); @@ -113,7 +113,7 @@ i, link_new ? "up" : "down"); } -@@ -2074,10 +2074,10 @@ ar8xxx_phy_read_status(struct phy_device +@@ -2079,10 +2079,10 @@ ar8xxx_phy_read_status(struct phy_device if (phydev->state == PHY_CHANGELINK) ar8xxx_check_link_states(priv); @@ -126,7 +126,7 @@ phydev->link = !!link.link; if (!phydev->link) return 0; -@@ -2107,7 +2107,7 @@ ar8xxx_phy_read_status(struct phy_device +@@ -2112,7 +2112,7 @@ ar8xxx_phy_read_status(struct phy_device static int ar8xxx_phy_config_aneg(struct phy_device *phydev) { @@ -135,7 +135,7 @@ return 0; return genphy_config_aneg(phydev); -@@ -2162,15 +2162,15 @@ ar8xxx_phy_probe(struct phy_device *phyd +@@ -2167,15 +2167,15 @@ ar8xxx_phy_probe(struct phy_device *phyd int ret; /* skip PHYs at unused adresses */ @@ -154,7 +154,7 @@ goto found; priv = ar8xxx_create(); -@@ -2179,7 +2179,7 @@ ar8xxx_phy_probe(struct phy_device *phyd +@@ -2184,7 +2184,7 @@ ar8xxx_phy_probe(struct phy_device *phyd goto unlock; } @@ -163,7 +163,7 @@ ret = ar8xxx_probe_switch(priv); if (ret) -@@ -2200,7 +2200,7 @@ ar8xxx_phy_probe(struct phy_device *phyd +@@ -2205,7 +2205,7 @@ ar8xxx_phy_probe(struct phy_device *phyd found: priv->use_count++; @@ -172,7 +172,7 @@ if (ar8xxx_has_gige(priv)) { phydev->supported = SUPPORTED_1000baseT_Full; phydev->advertising = ADVERTISED_1000baseT_Full; -@@ -2288,21 +2288,33 @@ ar8xxx_phy_soft_reset(struct phy_device +@@ -2293,21 +2293,33 @@ ar8xxx_phy_soft_reset(struct phy_device return 0; } |