summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-12-09 01:00:24 +0100
committerWolfgang Denk <wd@denx.de>2008-12-09 01:00:24 +0100
commitc645b181a9a848996d54a5e358bedabae1da566a (patch)
treea05030fe0bfc31b049a2d498e0e8090816f28352 /drivers
parent5e3ab68e9acf9edf304b8aa32ad7e005483a2c47 (diff)
parent6a86bb6c25376f0358478219fa28d7c84dd01ed0 (diff)
downloadblackbird-obmc-uboot-c645b181a9a848996d54a5e358bedabae1da566a.tar.gz
blackbird-obmc-uboot-c645b181a9a848996d54a5e358bedabae1da566a.zip
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/tsec.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c
index d7da0819d1..fbc9a6dd05 100644
--- a/drivers/net/tsec.c
+++ b/drivers/net/tsec.c
@@ -1196,6 +1196,9 @@ struct phy_info phy_info_M88E1121R = {
{MIIM_88E1121_PHY_LED_CTRL, miim_read,
&mii_88E1121_set_led},
{MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init},
+ /* Disable IRQs and de-assert interrupt */
+ {MIIM_88E1121_PHY_IRQ_EN, 0, NULL},
+ {MIIM_88E1121_PHY_IRQ_STATUS, miim_read, NULL},
{miim_end,}
},
(struct phy_cmd[]){ /* startup */
OpenPOWER on IntegriCloud