summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-03-10 22:04:04 +0100
committerWolfgang Denk <wd@denx.de>2009-03-10 22:04:04 +0100
commit3c92217732edfc0016c3cbdc828471d013d23a36 (patch)
treef695fd402c8cd78b0d5f1e66a0e2ca17c7f7d146 /drivers/net
parentb5a15c90a6f1230723c4e887a707d9c41ac3f4e2 (diff)
parent0452352df118bc9dd684a056aaaa5fb4aed1178a (diff)
downloadu-boot-imx-3c92217732edfc0016c3cbdc828471d013d23a36.zip
u-boot-imx-3c92217732edfc0016c3cbdc828471d013d23a36.tar.gz
u-boot-imx-3c92217732edfc0016c3cbdc828471d013d23a36.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/tsec.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c
index 1f5d1b4..399116f 100644
--- a/drivers/net/tsec.c
+++ b/drivers/net/tsec.c
@@ -1624,7 +1624,7 @@ struct phy_info *phy_info[] = {
&phy_info_VSC8601,
&phy_info_dp83865,
&phy_info_rtl8211b,
- &phy_info_generic,
+ &phy_info_generic, /* must be last; has ID 0 and 32 bit mask */
NULL
};
@@ -1656,9 +1656,8 @@ struct phy_info *get_phy_info(struct eth_device *dev)
}
}
- if (theInfo == NULL) {
- printf("%s: PHY id %x is not supported!\n", dev->name, phy_ID);
- return NULL;
+ if (theInfo == &phy_info_generic) {
+ printf("%s: No support for PHY id %x; assuming generic\n", dev->name, phy_ID);
} else {
debug("%s: PHY is %s (%x)\n", dev->name, theInfo->name, phy_ID);
}