hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

generic: make chip detection more reliable in the AR8216 driver 

Fixes broken ethernet on the Planex MZK-W04NU/W300NH boards.

Cc: bacfire@openwrt.org

SVN-Revision: 20753
owl
Gabor Juhos 2010-04-09 08:40:12 +00:00
parent d6c0363884
commit 72d4353728
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
target/linux/generic-2.6/files/drivers/net/phy/ar8216.c
View File

@ -33,6 +33,7 @@
/* size of the vlan table */ /* size of the vlan table */
#define AR8X16_MAX_VLANS 128 #define AR8X16_MAX_VLANS 128
#define AR8X16_PROBE_RETRIES 10
struct ar8216_priv { struct ar8216_priv {
struct switch_dev dev; struct switch_dev dev;
@ -119,8 +120,25 @@ ar8216_id_chip(struct ar8216_priv *priv)
{ {
u32 val; u32 val;
u16 id; u16 id;
int i;
val = ar8216_mii_read(priv, AR8216_REG_CTRL); val = ar8216_mii_read(priv, AR8216_REG_CTRL);
if (val == ~0)
return UNKNOWN;
id = val & (AR8216_CTRL_REVISION | AR8216_CTRL_VERSION); id = val & (AR8216_CTRL_REVISION | AR8216_CTRL_VERSION);
for (i = 0; i < AR8X16_PROBE_RETRIES; i++) {
u16 t;
val = ar8216_mii_read(priv, AR8216_REG_CTRL);
if (val == ~0)
return UNKNOWN;
t = val & (AR8216_CTRL_REVISION | AR8216_CTRL_VERSION);
if (t != id)
return UNKNOWN;
}
switch (id) { switch (id) {
case 0x0101: case 0x0101:
return AR8216; return AR8216;
@ -736,11 +754,13 @@ static int
ar8216_probe(struct phy_device *pdev) ar8216_probe(struct phy_device *pdev)
{ {
struct ar8216_priv priv; struct ar8216_priv priv;
u16 chip;
priv.phy = pdev; priv.phy = pdev;
if (ar8216_id_chip(&priv) == UNKNOWN) { chip = ar8216_id_chip(&priv);
if (chip == UNKNOWN)
return -ENODEV; return -ENODEV;
}
return 0; return 0;
} }