aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/702-phy_add_aneg_done_function.patch
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2014-10-27 18:14:39 +0000
committerRafał Miłecki <zajec5@gmail.com>2014-10-27 18:14:39 +0000
commit1513b39a8c8e21e3f8fbebab9fb4c41040ccf695 (patch)
tree7c786effff410b4a96d29c920d60cd279236fbf7 /target/linux/generic/patches-3.18/702-phy_add_aneg_done_function.patch
parent38e72c779e229933625d96d4355a0250123b6ce5 (diff)
downloadupstream-1513b39a8c8e21e3f8fbebab9fb4c41040ccf695.tar.gz
upstream-1513b39a8c8e21e3f8fbebab9fb4c41040ccf695.tar.bz2
upstream-1513b39a8c8e21e3f8fbebab9fb4c41040ccf695.zip
kernel: start working on 3.18 support
This commit: 1) Copies 3.14 patches 2) Drops mainlined stuff 3) Modifies some patches to apply Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 43093
Diffstat (limited to 'target/linux/generic/patches-3.18/702-phy_add_aneg_done_function.patch')
-rw-r--r--target/linux/generic/patches-3.18/702-phy_add_aneg_done_function.patch49
1 files changed, 49 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.18/702-phy_add_aneg_done_function.patch b/target/linux/generic/patches-3.18/702-phy_add_aneg_done_function.patch
new file mode 100644
index 0000000000..d634647ddb
--- /dev/null
+++ b/target/linux/generic/patches-3.18/702-phy_add_aneg_done_function.patch
@@ -0,0 +1,49 @@
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -417,9 +417,18 @@ struct phy_driver {
+ */
+ int (*config_aneg)(struct phy_device *phydev);
+
++ /* Determine if autonegotiation is done */
++ int (*aneg_done)(struct phy_device *phydev);
++
+ /* Determines the negotiated speed and duplex */
+ int (*read_status)(struct phy_device *phydev);
+
++ /*
++ * Update the value in phydev->link to reflect the
++ * current link value
++ */
++ int (*update_link)(struct phy_device *phydev);
++
+ /* Clears any pending interrupts */
+ int (*ack_interrupt)(struct phy_device *phydev);
+
+--- a/drivers/net/phy/phy_device.c
++++ b/drivers/net/phy/phy_device.c
+@@ -881,6 +881,9 @@ int genphy_update_link(struct phy_device
+ {
+ int status;
+
++ if (phydev->drv->update_link)
++ return phydev->drv->update_link(phydev);
++
+ /* Do a fake read */
+ status = phy_read(phydev, MII_BMSR);
+ if (status < 0)
+--- a/drivers/net/phy/phy.c
++++ b/drivers/net/phy/phy.c
+@@ -99,7 +99,12 @@ static int phy_config_interrupt(struct p
+ */
+ static inline int phy_aneg_done(struct phy_device *phydev)
+ {
+- int retval = phy_read(phydev, MII_BMSR);
++ int retval;
++
++ if (phydev->drv->aneg_done)
++ return phydev->drv->aneg_done(phydev);
++
++ retval = phy_read(phydev, MII_BMSR);
+
+ return (retval < 0) ? retval : (retval & BMSR_ANEGCOMPLETE);
+ }