Don't enable the interrupt if the platform disable the energy detection
by "smsc,disable-energy-detect".

Signed-off-by: Marco Felsch <m.fel...@pengutronix.de>
Reviewed-by: Andrew Lunn <and...@lunn.ch>
---
v2:
- Add Andrew's tag

 drivers/net/phy/smsc.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c
index 74568ae16125..fa539a867de6 100644
--- a/drivers/net/phy/smsc.c
+++ b/drivers/net/phy/smsc.c
@@ -37,10 +37,17 @@ struct smsc_phy_priv {
 
 static int smsc_phy_config_intr(struct phy_device *phydev)
 {
-       int rc = phy_write (phydev, MII_LAN83C185_IM,
-                       ((PHY_INTERRUPT_ENABLED == phydev->interrupts)
-                       ? MII_LAN83C185_ISF_INT_PHYLIB_EVENTS
-                       : 0));
+       struct smsc_phy_priv *priv = phydev->priv;
+       u16 intmask = 0;
+       int rc;
+
+       if (phydev->interrupts) {
+               intmask = MII_LAN83C185_ISF_INT4 | MII_LAN83C185_ISF_INT6;
+               if (priv->energy_enable)
+                       intmask |= MII_LAN83C185_ISF_INT7;
+       }
+
+       rc = phy_write(phydev, MII_LAN83C185_IM, intmask);
 
        return rc < 0 ? rc : 0;
 }
-- 
2.20.1

Reply via email to