|
|
|
@ -12,7 +12,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> |
|
|
|
|
#include <bcm47xx_nvram.h>
|
|
|
|
|
|
|
|
|
|
static const struct bcma_device_id bgmac_bcma_tbl[] = {
|
|
|
|
|
@@ -1432,6 +1433,17 @@ static void bgmac_mii_unregister(struct
|
|
|
|
|
@@ -1538,6 +1539,17 @@ static void bgmac_mii_unregister(struct
|
|
|
|
|
mdiobus_free(mii_bus);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -30,9 +30,9 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> |
|
|
|
|
/**************************************************
|
|
|
|
|
* BCMA bus ops
|
|
|
|
|
**************************************************/
|
|
|
|
|
@@ -1551,6 +1563,16 @@ static int bgmac_probe(struct bcma_devic
|
|
|
|
|
goto err_dma_free;
|
|
|
|
|
}
|
|
|
|
|
@@ -1664,6 +1676,16 @@ static int bgmac_probe(struct bcma_devic
|
|
|
|
|
net_dev->hw_features = net_dev->features;
|
|
|
|
|
net_dev->vlan_features = net_dev->features;
|
|
|
|
|
|
|
|
|
|
+ if ((ci->id == BCMA_CHIP_ID_BCM4707 ||
|
|
|
|
|
+ ci->id == BCMA_CHIP_ID_BCM53018) &&
|
|
|
|
@ -47,7 +47,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> |
|
|
|
|
err = register_netdev(bgmac->net_dev);
|
|
|
|
|
if (err) {
|
|
|
|
|
bgmac_err(bgmac, "Cannot register net device\n");
|
|
|
|
|
@@ -1577,6 +1599,10 @@ static void bgmac_remove(struct bcma_dev
|
|
|
|
|
@@ -1690,6 +1712,10 @@ static void bgmac_remove(struct bcma_dev
|
|
|
|
|
{
|
|
|
|
|
struct bgmac *bgmac = bcma_get_drvdata(core);
|
|
|
|
|
|
|
|
|
@ -60,7 +60,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> |
|
|
|
|
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;
|
|
|
|
|