diff options
| author | Giuseppe CAVALLARO <peppe.cavallaro@st.com> | 2013-01-23 01:22:37 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-01-28 06:08:22 +0100 |
| commit | 014f2ffdf6e22581f172ba443be0ad924a913f46 (patch) | |
| tree | 335a355b26c3bf628522d24c2b1fbc6452eadbc2 /drivers/net/phy | |
| parent | net: phy: icplus: Use the RGMII interface mode to configure clock delays (diff) | |
| download | linux-014f2ffdf6e22581f172ba443be0ad924a913f46.tar.xz linux-014f2ffdf6e22581f172ba443be0ad924a913f46.zip | |
net: phy: icplus: fix broken INTR pin settings
This patch fixes the setting of the INTR pin that is
valid for IP101 A/G device and not for the IP1001.
Reported-by: Anunay Saxena <anunay.saxena@st.com>
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy')
| -rw-r--r-- | drivers/net/phy/icplus.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/phy/icplus.c b/drivers/net/phy/icplus.c index c0e092470182..b5ddd5077a80 100644 --- a/drivers/net/phy/icplus.c +++ b/drivers/net/phy/icplus.c @@ -139,11 +139,6 @@ static int ip1001_config_init(struct phy_device *phydev) if (c < 0) return c; - /* INTR pin used: speed/link/duplex will cause an interrupt */ - c = phy_write(phydev, IP101A_G_IRQ_CONF_STATUS, IP101A_G_IRQ_DEFAULT); - if (c < 0) - return c; - if ((phydev->interface == PHY_INTERFACE_MODE_RGMII) || (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) || (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID) || @@ -178,6 +173,11 @@ static int ip101a_g_config_init(struct phy_device *phydev) if (c < 0) return c; + /* INTR pin used: speed/link/duplex will cause an interrupt */ + c = phy_write(phydev, IP101A_G_IRQ_CONF_STATUS, IP101A_G_IRQ_DEFAULT); + if (c < 0) + return c; + /* Enable Auto Power Saving mode */ c = phy_read(phydev, IP10XX_SPEC_CTRL_STATUS); c |= IP101A_G_APS_ON; |