From 074af75668dd491042b07a26059927da38f13663 Mon Sep 17 00:00:00 2001 From: Imre Kaloz Date: Fri, 7 Mar 2014 11:27:00 +0000 Subject: add preliminary 3.14 support Signed-off-by: Imre Kaloz SVN-Revision: 39789 --- .../702-phy_add_aneg_done_function.patch | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 target/linux/generic/patches-3.14/702-phy_add_aneg_done_function.patch (limited to 'target/linux/generic/patches-3.14/702-phy_add_aneg_done_function.patch') diff --git a/target/linux/generic/patches-3.14/702-phy_add_aneg_done_function.patch b/target/linux/generic/patches-3.14/702-phy_add_aneg_done_function.patch new file mode 100644 index 0000000000..3137ba9a5c --- /dev/null +++ b/target/linux/generic/patches-3.14/702-phy_add_aneg_done_function.patch @@ -0,0 +1,45 @@ +--- 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 +@@ -882,6 +882,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,6 +99,9 @@ static int phy_config_interrupt(struct p + */ + static inline int phy_aneg_done(struct phy_device *phydev) + { ++ if (phydev->drv->aneg_done) ++ return phydev->drv->aneg_done(phydev); ++ + int retval = phy_read(phydev, MII_BMSR); + + return (retval < 0) ? retval : (retval & BMSR_ANEGCOMPLETE); -- cgit v1.2.3