aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-03-13 17:29:34 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-03-13 17:29:34 +0000
commit8449eecf5f5f842fb11fa38dd46459f9c28fdf15 (patch)
tree7c608ec11e887bab3dd8ff32b5e0a69e08653dfc /target
parent1c5ac02a29a1166700af119b3e7033c919397fd3 (diff)
downloadupstream-8449eecf5f5f842fb11fa38dd46459f9c28fdf15.tar.gz
upstream-8449eecf5f5f842fb11fa38dd46459f9c28fdf15.tar.bz2
upstream-8449eecf5f5f842fb11fa38dd46459f9c28fdf15.zip
ar71xx: ag71xx: allow to use port 5 of the AR934x built-in switch
SVN-Revision: 30923
Diffstat (limited to 'target')
-rw-r--r--target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ar7240.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ar7240.c b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ar7240.c
index 8a497b0cab..25ee7d4f14 100644
--- a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ar7240.c
+++ b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ar7240.c
@@ -1017,6 +1017,7 @@ static struct ar7240sw *ar7240_probe(struct ag71xx *ag)
if (sw_is_ar7240(as)) {
swdev->name = "AR7240/AR9330 built-in switch";
+ swdev->ports = AR7240_NUM_PORTS - 1;
} else if (sw_is_ar934x(as)) {
swdev->name = "AR934X built-in switch";
@@ -1032,16 +1033,19 @@ static struct ar7240sw *ar7240_probe(struct ag71xx *ag)
goto err_free;
}
- if (as->swdata->phy4_mii_en)
+ if (as->swdata->phy4_mii_en) {
ar7240sw_reg_set(mii, AR934X_REG_OPER_MODE1,
AR934X_REG_OPER_MODE1_PHY4_MII_EN);
+ swdev->ports = AR7240_NUM_PORTS - 1;
+ } else {
+ swdev->ports = AR7240_NUM_PORTS;
+ }
} else {
pr_err("%s: unsupported chip, ctrl=%08x\n",
ag->dev->name, ctrl);
goto err_free;
}
- swdev->ports = AR7240_NUM_PORTS - 1;
swdev->cpu_port = AR7240_PORT_CPU;
swdev->vlans = AR7240_MAX_VLANS;
swdev->ops = &ar7240_ops;