aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorGiuseppe CAVALLARO <peppe.cavallaro@st.com>2013-01-22 19:22:37 -0500
committerDavid S. Miller <davem@davemloft.net>2013-01-28 00:08:22 -0500
commit014f2ffdf6e22581f172ba443be0ad924a913f46 (patch)
tree335a355b26c3bf628522d24c2b1fbc6452eadbc2 /drivers/net
parentb4a496319f2fe4b46d7a9ab246f4fbf23a5a3106 (diff)
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')
-rw-r--r--drivers/net/phy/icplus.c10
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)
139 if (c < 0) 139 if (c < 0)
140 return c; 140 return c;
141 141
142 /* INTR pin used: speed/link/duplex will cause an interrupt */
143 c = phy_write(phydev, IP101A_G_IRQ_CONF_STATUS, IP101A_G_IRQ_DEFAULT);
144 if (c < 0)
145 return c;
146
147 if ((phydev->interface == PHY_INTERFACE_MODE_RGMII) || 142 if ((phydev->interface == PHY_INTERFACE_MODE_RGMII) ||
148 (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) || 143 (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) ||
149 (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID) || 144 (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID) ||
@@ -178,6 +173,11 @@ static int ip101a_g_config_init(struct phy_device *phydev)
178 if (c < 0) 173 if (c < 0)
179 return c; 174 return c;
180 175
176 /* INTR pin used: speed/link/duplex will cause an interrupt */
177 c = phy_write(phydev, IP101A_G_IRQ_CONF_STATUS, IP101A_G_IRQ_DEFAULT);
178 if (c < 0)
179 return c;
180
181 /* Enable Auto Power Saving mode */ 181 /* Enable Auto Power Saving mode */
182 c = phy_read(phydev, IP10XX_SPEC_CTRL_STATUS); 182 c = phy_read(phydev, IP10XX_SPEC_CTRL_STATUS);
183 c |= IP101A_G_APS_ON; 183 c |= IP101A_G_APS_ON;