summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRon Madrid <ron_madrid@sbcglobal.net>2009-01-28 16:17:21 -0800
committerBen Warren <biggerbadderben@gmail.com>2009-01-28 23:59:28 -0800
commit12a8b9db12f82a189ff143a58731007f5469da61 (patch)
tree2a47529e835793e9be235d03f607b3d98b633dcb
parent9a37f2acc31a3296dddd3574ea9eaf7f319807b9 (diff)
Marvell 88E1118 interrupt fix
This patch adjusts the LED control so that interrupt lines are not reading LEDs and effectively causing indefinite interrupts to the controller. Signed-off-by: Ron Madrid <ron_madrid@sbcglobal.net> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
-rw-r--r--drivers/net/tsec.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c
index fbc9a6dd0..dc90f2385 100644
--- a/drivers/net/tsec.c
+++ b/drivers/net/tsec.c
@@ -1141,6 +1141,9 @@ struct phy_info phy_info_M88E1118 = {
{MIIM_CONTROL, MIIM_CONTROL_RESET, NULL},
{0x16, 0x0002, NULL}, /* Change Page Number */
{0x15, 0x1070, NULL}, /* Delay RGMII TX and RX */
+ {0x16, 0x0003, NULL}, /* Change Page Number */
+ {0x10, 0x021e, NULL}, /* Adjust LED control */
+ {0x16, 0x0000, NULL}, /* Change Page Number */
{MIIM_GBIT_CONTROL, MIIM_GBIT_CONTROL_INIT, NULL},
{MIIM_ANAR, MIIM_ANAR_INIT, NULL},
{MIIM_CONTROL, MIIM_CONTROL_RESET, NULL},
@@ -1152,6 +1155,7 @@ struct phy_info phy_info_M88E1118 = {
/* Status is read once to clear old link state */
{MIIM_STATUS, miim_read, NULL},
/* Auto-negotiate */
+ {MIIM_STATUS, miim_read, &mii_parse_sr},
/* Read the status */
{MIIM_88E1011_PHY_STATUS, miim_read,
&mii_parse_88E1011_psr},