From: Rafał Miłecki <zajec5@gmail.com>
Date: Tue, 19 Feb 2013 18:41:42 +0000 (+0100)
Subject: bcma: ignore extra GMAC cores on BCM4706
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=10419d08b96e58e140ca44293ee941973396adee;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

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>
---

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);