diff options
| author |   Hauke Mehrtens <hauke@hauke-m.de> | 2013-02-06 04:44:57 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-02-06 16:06:49 -0500 |
| commit | b5a4c2f3d16790516ccd3b924049bab7ec2e50a2 (patch) | |
| tree | d2b4a2b1aaf1613a8a52477300d29810b0684d58 | |
| parent | macvlan: add multicast filter (diff) | |
| download | linux-dev-b5a4c2f3d16790516ccd3b924049bab7ec2e50a2.tar.xz linux-dev-b5a4c2f3d16790516ccd3b924049bab7ec2e50a2.zip | |
bgmac: implement missing code for BCM53572
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/broadcom/bgmac.c | 6 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/bgmac.h | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c index 9bd33db7fddd..58e0c708e253 100644 --- a/drivers/net/ethernet/broadcom/bgmac.c +++ b/drivers/net/ethernet/broadcom/bgmac.c @@ -889,8 +889,10 @@ static void bgmac_chip_reset(struct bgmac *bgmac) sw_type = et_swtype; } else if (ci->id == BCMA_CHIP_ID_BCM5357 && ci->pkg == 9) { sw_type = BGMAC_CHIPCTL_1_SW_TYPE_EPHYRMII; - } else if (0) { - /* TODO */ + } else if ((ci->id != BCMA_CHIP_ID_BCM53572 && ci->pkg == 10) || + (ci->id == BCMA_CHIP_ID_BCM53572 && ci->pkg == 9)) { + sw_type = BGMAC_CHIPCTL_1_IF_TYPE_RGMII | + BGMAC_CHIPCTL_1_SW_TYPE_RGMII; } bcma_chipco_chipctl_maskset(cc, 1, ~(BGMAC_CHIPCTL_1_IF_TYPE_MASK | diff --git a/drivers/net/ethernet/broadcom/bgmac.h b/drivers/net/ethernet/broadcom/bgmac.h index 129947017041..3dd6f6f7a098 100644 --- a/drivers/net/ethernet/broadcom/bgmac.h +++ b/drivers/net/ethernet/broadcom/bgmac.h @@ -339,7 +339,7 @@ #define BGMAC_CHIPCTL_1_SW_TYPE_EPHY 0x00000000 #define BGMAC_CHIPCTL_1_SW_TYPE_EPHYMII 0x00000040 #define BGMAC_CHIPCTL_1_SW_TYPE_EPHYRMII 0x00000080 -#define BGMAC_CHIPCTL_1_SW_TYPE_RGMI 0x000000C0 +#define BGMAC_CHIPCTL_1_SW_TYPE_RGMII 0x000000C0 #define BGMAC_CHIPCTL_1_RXC_DLL_BYPASS 0x00010000 #define BGMAC_SPEED_10 0x0001 |