Fixes broken ethernet on the Planex MZK-W04NU/W300NH boards.
Cc: bacfire@openwrt.org
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20753
3c298f89-4303-0410-b956-
a3cf2f4a3e73
/* size of the vlan table */
#define AR8X16_MAX_VLANS 128
/* size of the vlan table */
#define AR8X16_MAX_VLANS 128
+#define AR8X16_PROBE_RETRIES 10
struct ar8216_priv {
struct switch_dev dev;
struct ar8216_priv {
struct switch_dev dev;
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) {
case 0x0101:
return AR8216;
switch (id) {
case 0x0101:
return AR8216;
ar8216_probe(struct phy_device *pdev)
{
struct ar8216_priv priv;
ar8216_probe(struct phy_device *pdev)
{
struct ar8216_priv priv;
- if (ar8216_id_chip(&priv) == UNKNOWN) {
+ chip = ar8216_id_chip(&priv);
+ if (chip == UNKNOWN)