--- a/drivers/net/ethernet/broadcom/bgmac.c
+++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -16,6 +16,7 @@
- #include <linux/phy.h>
+@@ -17,6 +17,7 @@
+ #include <linux/phy_fixed.h>
#include <linux/interrupt.h>
#include <linux/dma-mapping.h>
+#include <linux/platform_data/b53.h>
#include <bcm47xx_nvram.h>
static const struct bcma_device_id bgmac_bcma_tbl[] = {
-@@ -1405,6 +1406,17 @@ static void bgmac_mii_unregister(struct
+@@ -1520,6 +1521,17 @@ static void bgmac_mii_unregister(struct
mdiobus_free(mii_bus);
}
/**************************************************
* BCMA bus ops
**************************************************/
-@@ -1521,6 +1533,16 @@ static int bgmac_probe(struct bcma_devic
- goto err_dma_free;
- }
+@@ -1646,6 +1658,16 @@ static int bgmac_probe(struct bcma_devic
+ net_dev->hw_features = net_dev->features;
+ net_dev->vlan_features = net_dev->features;
-+ if (core->id.id != BCMA_CHIP_ID_BCM4707 &&
-+ core->id.id != BCMA_CHIP_ID_BCM53018 &&
++ if ((ci->id == BCMA_CHIP_ID_BCM4707 ||
++ ci->id == BCMA_CHIP_ID_BCM53018) &&
+ !bgmac_b53_pdata.regs) {
+ bgmac_b53_pdata.regs = ioremap_nocache(0x18007000, 0x1000);
+
err = register_netdev(bgmac->net_dev);
if (err) {
bgmac_err(bgmac, "Cannot register net device\n");
-@@ -1549,6 +1571,10 @@ static void bgmac_remove(struct bcma_dev
+@@ -1672,6 +1694,10 @@ static void bgmac_remove(struct bcma_dev
{
struct bgmac *bgmac = bcma_get_drvdata(core);
+ platform_device_unregister(&bgmac_b53_dev);
+ bgmac->b53_device = NULL;
+
- netif_napi_del(&bgmac->napi);
unregister_netdev(bgmac->net_dev);
bgmac_mii_unregister(bgmac);
+ netif_napi_del(&bgmac->napi);
--- a/drivers/net/ethernet/broadcom/bgmac.h
+++ b/drivers/net/ethernet/broadcom/bgmac.h
-@@ -457,6 +457,9 @@ struct bgmac {
+@@ -462,6 +462,9 @@ struct bgmac {
bool has_robosw;
bool loopback;