generic: add aneg_done and update_link functions for the phy_device
SVN-Revision: 21726
This commit is contained in:
Gabor Juhos
parent
0cc840f158
commit
94c6afe09d
6 changed files with 270 additions and 0 deletions
|
|
@ -0,0 +1,45 @@
|
||||||
|
--- a/include/linux/phy.h
|
||||||
|
+++ b/include/linux/phy.h
|
||||||
|
@@ -393,9 +393,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
|
||||||
|
@@ -695,6 +695,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);
|
||||||
|
|
||||||
|
--- a/drivers/net/phy/phy.c
|
||||||
|
+++ b/drivers/net/phy/phy.c
|
||||||
|
@@ -107,6 +107,9 @@ static inline int phy_aneg_done(struct p
|
||||||
|
{
|
||||||
|
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);
|
||||||
|
|
@ -0,0 +1,45 @@
|
||||||
|
--- a/include/linux/phy.h
|
||||||
|
+++ b/include/linux/phy.h
|
||||||
|
@@ -393,9 +393,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
|
||||||
|
@@ -695,6 +695,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);
|
||||||
|
|
||||||
|
--- a/drivers/net/phy/phy.c
|
||||||
|
+++ b/drivers/net/phy/phy.c
|
||||||
|
@@ -107,6 +107,9 @@ static inline int phy_aneg_done(struct p
|
||||||
|
{
|
||||||
|
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);
|
||||||
|
|
@ -0,0 +1,45 @@
|
||||||
|
--- a/include/linux/phy.h
|
||||||
|
+++ b/include/linux/phy.h
|
||||||
|
@@ -393,9 +393,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
|
||||||
|
@@ -695,6 +695,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);
|
||||||
|
|
||||||
|
--- a/drivers/net/phy/phy.c
|
||||||
|
+++ b/drivers/net/phy/phy.c
|
||||||
|
@@ -107,6 +107,9 @@ static inline int phy_aneg_done(struct p
|
||||||
|
{
|
||||||
|
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);
|
||||||
|
|
@ -0,0 +1,45 @@
|
||||||
|
--- a/include/linux/phy.h
|
||||||
|
+++ b/include/linux/phy.h
|
||||||
|
@@ -393,9 +393,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
|
||||||
|
@@ -695,6 +695,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);
|
||||||
|
|
||||||
|
--- a/drivers/net/phy/phy.c
|
||||||
|
+++ b/drivers/net/phy/phy.c
|
||||||
|
@@ -107,6 +107,9 @@ static inline int phy_aneg_done(struct p
|
||||||
|
{
|
||||||
|
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);
|
||||||
|
|
@ -0,0 +1,45 @@
|
||||||
|
--- a/include/linux/phy.h
|
||||||
|
+++ b/include/linux/phy.h
|
||||||
|
@@ -393,9 +393,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
|
||||||
|
@@ -695,6 +695,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);
|
||||||
|
|
||||||
|
--- a/drivers/net/phy/phy.c
|
||||||
|
+++ b/drivers/net/phy/phy.c
|
||||||
|
@@ -107,6 +107,9 @@ static inline int phy_aneg_done(struct p
|
||||||
|
{
|
||||||
|
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);
|
||||||
|
|
@ -0,0 +1,45 @@
|
||||||
|
--- a/include/linux/phy.h
|
||||||
|
+++ b/include/linux/phy.h
|
||||||
|
@@ -393,9 +393,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
|
||||||
|
@@ -695,6 +695,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);
|
||||||
|
|
||||||
|
--- a/drivers/net/phy/phy.c
|
||||||
|
+++ b/drivers/net/phy/phy.c
|
||||||
|
@@ -107,6 +107,9 @@ static inline int phy_aneg_done(struct p
|
||||||
|
{
|
||||||
|
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);
|
||||||
Loading…
Reference in a new issue