5 files changed, 42 insertions, 6 deletions

diff --git a/drivers/bcma/Kconfig b/drivers/bcma/Kconfig
index fb7c80fb721e..9319cde8d751 100644
--- a/drivers/bcma/Kconfig
+++ b/drivers/bcma/Kconfig
@@ -46,6 +46,15 @@ config BCMA_DRIVER_MIPS
 
           If unsure, say N
 
+config BCMA_DRIVER_GMAC_CMN
+        bool "BCMA Broadcom GBIT MAC COMMON core driver"
+        depends on BCMA
+        help
+          Driver for the Broadcom GBIT MAC COMMON core attached to Broadcom
+          specific Advanced Microcontroller Bus.
+
+          If unsure, say N
+
 config BCMA_DEBUG
         bool "BCMA debugging"
         depends on BCMA
diff --git a/drivers/bcma/Makefile b/drivers/bcma/Makefile
index 82de24e5340c..d13803faf1d6 100644
--- a/drivers/bcma/Makefile
+++ b/drivers/bcma/Makefile
@@ -3,6 +3,7 @@ bcma-y					+= driver_chipcommon.o driver_chipcommon_pmu.o
 bcma-y                                  += driver_pci.o
 bcma-$(CONFIG_BCMA_DRIVER_PCI_HOSTMODE) += driver_pci_host.o
 bcma-$(CONFIG_BCMA_DRIVER_MIPS)         += driver_mips.o
+bcma-$(CONFIG_BCMA_DRIVER_GMAC_CMN)     += driver_gmac_cmn.o
 bcma-$(CONFIG_BCMA_HOST_PCI)            += host_pci.o
 bcma-$(CONFIG_BCMA_HOST_SOC)            += host_soc.o
 obj-$(CONFIG_BCMA)                      += bcma.o
diff --git a/drivers/bcma/driver_gmac_cmn.c b/drivers/bcma/driver_gmac_cmn.c
new file mode 100644
index 000000000000..834225f65e8f
--- /dev/null
+++ b/drivers/bcma/driver_gmac_cmn.c
@@ -0,0 +1,14 @@
+/*
+ * Broadcom specific AMBA
+ * GBIT MAC COMMON Core
+ *
+ * Licensed under the GNU/GPL. See COPYING for details.
+ */
+
+#include "bcma_private.h"
+#include <linux/bcma/bcma.h>
+
+void __devinit bcma_core_gmac_cmn_init(struct bcma_drv_gmac_cmn *gc)
+{
+        mutex_init(&gc->phy_mutex);
+}
diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
index 151bddc57e16..758af9ccdef0 100644
--- a/drivers/bcma/main.c
+++ b/drivers/bcma/main.c
@@ -103,6 +103,7 @@ static int bcma_register_cores(struct bcma_bus *bus)
                 case BCMA_CORE_PCI:
                 case BCMA_CORE_PCIE:
                 case BCMA_CORE_MIPS_74K:
+                case BCMA_CORE_4706_MAC_GBIT_COMMON:
                         continue;
                 }
 
@@ -185,6 +186,13 @@ int __devinit bcma_bus_register(struct bcma_bus *bus)
                 bcma_core_pci_init(&bus->drv_pci);
         }
 
+        /* Init GBIT MAC COMMON core */
+        core = bcma_find_core(bus, BCMA_CORE_4706_MAC_GBIT_COMMON);
+        if (core) {
+                bus->drv_gmac_cmn.core = core;
+                bcma_core_gmac_cmn_init(&bus->drv_gmac_cmn);
+        }
+
         /* Try to get SPROM */
         err = bcma_sprom_get(bus);
         if (err == -ENOENT) {
diff --git a/drivers/bcma/scan.c b/drivers/bcma/scan.c
index a0272bbfc4f6..3bc3ec26fd0e 100644
--- a/drivers/bcma/scan.c
+++ b/drivers/bcma/scan.c
@@ -21,6 +21,7 @@ struct bcma_device_id_name {
 };
 
 static const struct bcma_device_id_name bcma_arm_device_names[] = {
+        { BCMA_CORE_4706_MAC_GBIT_COMMON, "BCM4706 GBit MAC Common" },
         { BCMA_CORE_ARM_1176, "ARM 1176" },
         { BCMA_CORE_ARM_7TDMI, "ARM 7TDMI" },
         { BCMA_CORE_ARM_CM3, "ARM CM3" },
@@ -33,7 +34,6 @@ static const struct bcma_device_id_name bcma_bcm_device_names[] = {
         { BCMA_CORE_4706_MAC_GBIT, "BCM4706 GBit MAC" },
         { BCMA_CORE_AMEMC, "AMEMC (DDR)" },
         { BCMA_CORE_ALTA, "ALTA (I2S)" },
-        { BCMA_CORE_4706_MAC_GBIT_COMMON, "BCM4706 GBit MAC Common" },
         { BCMA_CORE_INVALID, "Invalid" },
         { BCMA_CORE_CHIPCOMMON, "ChipCommon" },
         { BCMA_CORE_ILINE20, "ILine 20" },
@@ -295,11 +295,15 @@ static int bcma_get_next_core(struct bcma_bus *bus, u32 __iomem **eromptr,
 
         /* check if component is a core at all */
         if (wrappers[0] + wrappers[1] == 0) {
-                /* we could save addrl of the router
-                if (cid == BCMA_CORE_OOB_ROUTER)
-                 */
-                bcma_erom_skip_component(bus, eromptr);
-                return -ENXIO;
+                /* Some specific cores don't need wrappers */
+                switch (core->id.id) {
+                case BCMA_CORE_4706_MAC_GBIT_COMMON:
+                /* Not used yet: case BCMA_CORE_OOB_ROUTER: */
+                        break;
+                default:
+                        bcma_erom_skip_component(bus, eromptr);
+                        return -ENXIO;
+                }
         }
 
         if (bcma_erom_is_bridge(bus, eromptr)) {