summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-07-21 22:59:26 +0200
committerRalf Baechle <ralf@linux-mips.org>2010-07-26 19:08:18 +0100
commit7f13f65e61f1deed77c5c335ed0fa4d08f69e608 (patch)
tree3dacdf60e053e8aa74c411a82e025ea5c8b0f9d2 /arch
parentf2a68272d799bf4092443357142f63b74f7669a1 (diff)
downloadlinux-3.10-7f13f65e61f1deed77c5c335ed0fa4d08f69e608.tar.gz
linux-3.10-7f13f65e61f1deed77c5c335ed0fa4d08f69e608.tar.bz2
linux-3.10-7f13f65e61f1deed77c5c335ed0fa4d08f69e608.zip
MIPS: BCM63xx: Prevent second enet registration on BCM6338
This SoC has only one ethernet MAC, so prevent registration of a second one. Signed-off-by: Florian Fainelli <florian@openwrt.org> To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/1482/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/bcm63xx/dev-enet.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/mips/bcm63xx/dev-enet.c b/arch/mips/bcm63xx/dev-enet.c
index 9f544badd0b..39c23366c5c 100644
--- a/arch/mips/bcm63xx/dev-enet.c
+++ b/arch/mips/bcm63xx/dev-enet.c
@@ -104,6 +104,9 @@ int __init bcm63xx_enet_register(int unit,
if (unit > 1)
return -ENODEV;
+ if (unit == 1 && BCMCPU_IS_6338())
+ return -ENODEV;
+
if (!shared_device_registered) {
shared_res[0].start = bcm63xx_regset_address(RSET_ENETDMA);
shared_res[0].end = shared_res[0].start;