Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] au1000_eth: Misc Au1000 net driver fixes.

o Add support for DP83847 MII.
o remove unused variable.
o Add some initialisations so even an unknown MII won't result in a crash.
o Correct error message to "no known MIIs found".

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

drivers/net/au1000_eth.c | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

authored by

Ralf Baechle and committed by
Jeff Garzik
7f553e3d 04115def

+5 -8
+5 -8
drivers/net/au1000_eth.c
··· 151 151 SUPPORTED_100baseT_Half | SUPPORTED_100baseT_Full | \ 152 152 SUPPORTED_Autoneg 153 153 154 - static char *phy_link[] = 155 - { "unknown", 156 - "10Base2", "10BaseT", 157 - "AUI", 158 - "100BaseT", "100BaseTX", "100BaseFX" 159 - }; 160 - 161 154 int bcm_5201_init(struct net_device *dev, int phy_addr) 162 155 { 163 156 s16 data; ··· 778 785 {"Broadcom BCM5201 10/100 BaseT PHY",0x0040,0x6212, &bcm_5201_ops,0}, 779 786 {"Broadcom BCM5221 10/100 BaseT PHY",0x0040,0x61e4, &bcm_5201_ops,0}, 780 787 {"Broadcom BCM5222 10/100 BaseT PHY",0x0040,0x6322, &bcm_5201_ops,1}, 788 + {"NS DP83847 PHY", 0x2000, 0x5c30, &bcm_5201_ops ,0}, 781 789 {"AMD 79C901 HomePNA PHY",0x0000,0x35c8, &am79c901_ops,0}, 782 790 {"AMD 79C874 10/100 BaseT PHY",0x0022,0x561b, &am79c874_ops,0}, 783 791 {"LSI 80227 10/100 BaseT PHY",0x0016,0xf840, &lsi_80227_ops,0}, ··· 1039 1045 #endif 1040 1046 1041 1047 if (aup->mii->chip_info == NULL) { 1042 - printk(KERN_ERR "%s: Au1x No MII transceivers found!\n", 1048 + printk(KERN_ERR "%s: Au1x No known MII transceivers found!\n", 1043 1049 dev->name); 1044 1050 return -1; 1045 1051 } ··· 1540 1546 printk(KERN_ERR "%s: out of memory\n", dev->name); 1541 1547 goto err_out; 1542 1548 } 1549 + aup->mii->next = NULL; 1550 + aup->mii->chip_info = NULL; 1551 + aup->mii->status = 0; 1543 1552 aup->mii->mii_control_reg = 0; 1544 1553 aup->mii->mii_data_reg = 0; 1545 1554