KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

generic: ar8216: replace chip_type field with chip_{ver,rev} in ar8216_priv

Browse source 
SVN-Revision: 31999
This commit is contained in:
Gabor Juhos 2012-05-29 16:39:26 +00:00
parent b2fce19a70
commit 0d241e6670
2 changed files with 25 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
target/linux/generic/files/drivers/net/phy/ar8216.c
View file

@ -43,6 +43,13 @@ struct ar8216_priv;
#define AR8XXX_CAP_GIGE BIT(0) #define AR8XXX_CAP_GIGE BIT(0)
enum {
AR8XXX_VER_AR8216 = 0x01,
AR8XXX_VER_AR8236 = 0x03,
AR8XXX_VER_AR8316 = 0x10,
AR8XXX_VER_AR8327 = 0x12,
};
struct ar8xxx_chip { struct ar8xxx_chip {
unsigned long caps; unsigned long caps;
@ -65,7 +72,8 @@ struct ar8216_priv {
const struct net_device_ops *ndo_old; const struct net_device_ops *ndo_old;
struct net_device_ops ndo; struct net_device_ops ndo;
struct mutex reg_mutex; struct mutex reg_mutex;
int chip_type; u8 chip_ver;
u8 chip_rev;
const struct ar8xxx_chip *chip; const struct ar8xxx_chip *chip;
bool initialized; bool initialized;
bool port4_phy; bool port4_phy;
@ -91,22 +99,22 @@ static inline bool ar8xxx_has_gige(struct ar8216_priv *priv)
static inline bool chip_is_ar8216(struct ar8216_priv *priv) static inline bool chip_is_ar8216(struct ar8216_priv *priv)
{ {
return priv->chip_type == AR8216; return priv->chip_ver == AR8XXX_VER_AR8216;
} }
static inline bool chip_is_ar8236(struct ar8216_priv *priv) static inline bool chip_is_ar8236(struct ar8216_priv *priv)
{ {
return priv->chip_type == AR8236; return priv->chip_ver == AR8XXX_VER_AR8236;
} }
static inline bool chip_is_ar8316(struct ar8216_priv *priv) static inline bool chip_is_ar8316(struct ar8216_priv *priv)
{ {
return priv->chip_type == AR8316; return priv->chip_ver == AR8XXX_VER_AR8316;
} }
static inline bool chip_is_ar8327(struct ar8216_priv *priv) static inline bool chip_is_ar8327(struct ar8216_priv *priv)
{ {
return priv->chip_type == AR8327; return priv->chip_ver == AR8XXX_VER_AR8327;
} }
static inline void static inline void
@ -1179,8 +1187,6 @@ ar8216_id_chip(struct ar8216_priv *priv)
u16 id; u16 id;
int i; int i;
priv->chip_type = UNKNOWN;
val = ar8216_mii_read(priv, AR8216_REG_CTRL); val = ar8216_mii_read(priv, AR8216_REG_CTRL);
if (val == ~0) if (val == ~0)
return -ENODEV; return -ENODEV;
@ -1198,30 +1204,27 @@ ar8216_id_chip(struct ar8216_priv *priv)
return -ENODEV; return -ENODEV;
} }
switch (id) { priv->chip_ver = (id & AR8216_CTRL_VERSION) >> AR8216_CTRL_VERSION_S;
case 0x0101: priv->chip_rev = (id & AR8216_CTRL_REVISION);
priv->chip_type = AR8216;
switch (priv->chip_ver) {
case AR8XXX_VER_AR8216:
priv->chip = &ar8216_chip; priv->chip = &ar8216_chip;
break; break;
case 0x0301: case AR8XXX_VER_AR8236:
priv->chip_type = AR8236;
priv->chip = &ar8236_chip; priv->chip = &ar8236_chip;
break; break;
case 0x1000: case AR8XXX_VER_AR8316:
case 0x1001:
priv->chip_type = AR8316;
priv->chip = &ar8316_chip; priv->chip = &ar8316_chip;
break; break;
case 0x1202: case AR8XXX_VER_AR8327:
priv->chip_type = AR8327;
priv->mii_lo_first = true; priv->mii_lo_first = true;
priv->chip = &ar8327_chip; priv->chip = &ar8327_chip;
break; break;
default: default:
printk(KERN_DEBUG printk(KERN_DEBUG
"ar8216: Unknown Atheros device [ver=%d, rev=%d, phy_id=%04x%04x]\n", "ar8216: Unknown Atheros device [ver=%d, rev=%d, phy_id=%04x%04x]\n",
(int)(id >> AR8216_CTRL_VERSION_S), priv->chip_ver, priv->chip_rev,
(int)(id & AR8216_CTRL_REVISION),
mdiobus_read(priv->phy->bus, priv->phy->addr, 2), mdiobus_read(priv->phy->bus, priv->phy->addr, 2),
mdiobus_read(priv->phy->bus, priv->phy->addr, 3)); mdiobus_read(priv->phy->bus, priv->phy->addr, 3));
@ -1287,9 +1290,6 @@ ar8216_config_init(struct phy_device *pdev)
return 0; return 0;
} }
printk(KERN_INFO "%s: AR%d switch driver attached.\n",
pdev->attached_dev->name, priv->chip_type);
if (ar8xxx_has_gige(priv)) if (ar8xxx_has_gige(priv))
pdev->supported = SUPPORTED_1000baseT_Full; pdev->supported = SUPPORTED_1000baseT_Full;
else else
@ -1332,6 +1332,9 @@ ar8216_config_init(struct phy_device *pdev)
if (ret) if (ret)
goto err_free_priv; goto err_free_priv;
printk(KERN_INFO "%s: %s switch driver attached.\n",
pdev->attached_dev->name, swdev->name);
priv->init = true; priv->init = true;
ret = priv->chip->hw_init(priv); ret = priv->chip->hw_init(priv);

9
target/linux/generic/files/drivers/net/phy/ar8216.h
View file

@ -334,13 +334,4 @@ enum {
AR8216_PORT_STATE_FORWARD = 4 AR8216_PORT_STATE_FORWARD = 4
}; };
/* device */
enum {
UNKNOWN = 0,
AR8216 = 8216,
AR8236 = 8236,
AR8316 = 8316,
AR8327 = 8327,
};
#endif #endif