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

ar8216: introduce global constant for number of PHYs 

All supported switches have 5 PHYs. Currently partially 5 is hardcoded
and partially switch-specific constants exist.
Replace them with a global constant.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>

SVN-Revision: 43328
lede-17.01
Felix Fietkau 2014-11-19 20:17:30 +00:00
parent 226f330bcf
commit 6dcdc2bb05
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
target/linux/generic/files/drivers/net/phy/ar8216.c
View File

@ -51,6 +51,8 @@ struct ar8xxx_priv;
#define AR8XXX_CAP_GIGE BIT(0) #define AR8XXX_CAP_GIGE BIT(0)
#define AR8XXX_CAP_MIB_COUNTERS BIT(1) #define AR8XXX_CAP_MIB_COUNTERS BIT(1)
#define AR8XXX_NUM_PHYS 5
enum { enum {
AR8XXX_VER_AR8216 = 0x01, AR8XXX_VER_AR8216 = 0x01,
AR8XXX_VER_AR8236 = 0x03, AR8XXX_VER_AR8236 = 0x03,
@ -868,7 +870,7 @@ ar8236_hw_init(struct ar8xxx_priv *priv)
/* Initialize the PHYs */ /* Initialize the PHYs */
bus = priv->mii_bus; bus = priv->mii_bus;
for (i = 0; i < 5; i++) { for (i = 0; i < AR8XXX_NUM_PHYS; i++) {
mdiobus_write(bus, i, MII_ADVERTISE, mdiobus_write(bus, i, MII_ADVERTISE,
ADVERTISE_ALL | ADVERTISE_PAUSE_CAP | ADVERTISE_ALL | ADVERTISE_PAUSE_CAP |
ADVERTISE_PAUSE_ASYM); ADVERTISE_PAUSE_ASYM);
@ -954,7 +956,7 @@ ar8316_hw_init(struct ar8xxx_priv *priv)
/* Initialize the ports */ /* Initialize the ports */
bus = priv->mii_bus; bus = priv->mii_bus;
for (i = 0; i < 5; i++) { for (i = 0; i < AR8XXX_NUM_PHYS; i++) {
/* initialize the port itself */ /* initialize the port itself */
mdiobus_write(bus, i, MII_ADVERTISE, mdiobus_write(bus, i, MII_ADVERTISE,
ADVERTISE_ALL | ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM); ADVERTISE_ALL | ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM);
@ -1609,7 +1611,7 @@ ar8327_hw_init(struct ar8xxx_priv *priv)
ar8327_leds_init(priv); ar8327_leds_init(priv);
bus = priv->mii_bus; bus = priv->mii_bus;
for (i = 0; i < AR8327_NUM_PHYS; i++) { for (i = 0; i < AR8XXX_NUM_PHYS; i++) {
ar8327_phy_fixup(priv, i); ar8327_phy_fixup(priv, i);
/* start aneg on the PHY */ /* start aneg on the PHY */

1
target/linux/generic/files/drivers/net/phy/ar8216.h
View File

@ -291,7 +291,6 @@
#define AR8327_NUM_PORTS 7 #define AR8327_NUM_PORTS 7
#define AR8327_NUM_LEDS 15 #define AR8327_NUM_LEDS 15
#define AR8327_NUM_PHYS 5
#define AR8327_PORTS_ALL 0x7f #define AR8327_PORTS_ALL 0x7f
#define AR8327_NUM_LED_CTRL_REGS 4 #define AR8327_NUM_LED_CTRL_REGS 4