aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-07-14 14:11:17 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2013-07-14 14:11:17 +0000
commitf8d55e7541ee61c8e4262e378335beb2eba8a88a (patch)
tree548803b3e402425ccf09e13bec58740873d81f11 /target/linux/generic
parent936683b2dea18c535cba1be3af207338c10dd658 (diff)
downloadupstream-f8d55e7541ee61c8e4262e378335beb2eba8a88a.tar.gz
upstream-f8d55e7541ee61c8e4262e378335beb2eba8a88a.tar.bz2
upstream-f8d55e7541ee61c8e4262e378335beb2eba8a88a.zip
brcm47xx: use b53 phy driver for the switch in kernel 3.10
This makes it possible to use swconfig to controll the switch. This was tested with devices using b43 and bgmac. This was not tested on devices using tg3. This does not support the adm switch used in some very old devices. SVN-Revision: 37304
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/files/drivers/net/phy/b53/b53_common.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/target/linux/generic/files/drivers/net/phy/b53/b53_common.c b/target/linux/generic/files/drivers/net/phy/b53/b53_common.c
index c74bf7fbcb..86e3a787fb 100644
--- a/target/linux/generic/files/drivers/net/phy/b53/b53_common.c
+++ b/target/linux/generic/files/drivers/net/phy/b53/b53_common.c
@@ -1155,8 +1155,13 @@ int b53_switch_init(struct b53_device *dev)
dev->enabled_ports &= ~BIT(4);
break;
default:
+/* On the BCM47XX SoCs this is the supported internal switch.*/
+#ifndef CONFIG_BCM47XX
/* BCM5325M */
return -EINVAL;
+#else
+ break;
+#endif
}
} else if (dev->chip_id == BCM53115_DEVICE_ID) {
u64 strap_value;