summaryrefslogtreecommitdiffstats
path: root/drivers/bcma
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2013-02-19 19:41:42 +0100
committerJohn W. Linville <linville@tuxdriver.com>2013-03-06 16:24:24 -0500
commit10419d08b96e58e140ca44293ee941973396adee (patch)
tree0ccdcaaa157132fedcdd02fd6f5e0cebe50273fe /drivers/bcma
parent3a703ab5fba5b00292c1e7e964783c304f43fef7 (diff)
downloadlinux-stable-10419d08b96e58e140ca44293ee941973396adee.tar.gz
linux-stable-10419d08b96e58e140ca44293ee941973396adee.tar.bz2
linux-stable-10419d08b96e58e140ca44293ee941973396adee.zip
bcma: ignore extra GMAC cores on BCM4706
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/bcma')
-rw-r--r--drivers/bcma/main.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
index 9a6188add590..f72f52b4b1dd 100644
--- a/drivers/bcma/main.c
+++ b/drivers/bcma/main.c
@@ -120,6 +120,11 @@ static int bcma_register_cores(struct bcma_bus *bus)
continue;
}
+ /* Only first GMAC core on BCM4706 is connected and working */
+ if (core->id.id == BCMA_CORE_4706_MAC_GBIT &&
+ core->core_unit > 0)
+ continue;
+
core->dev.release = bcma_release_core_dev;
core->dev.bus = &bcma_bus_type;
dev_set_name(&core->dev, "bcma%d:%d", bus->num, dev_id);