bgmac: implement missing code for BCM53572

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c
index 9bd33db7fddd32912cd889386c7583692dd779df..58e0c708e2536de3ffef054acc0682d0770dbd0e 100644 (file)
--- 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 1299470170418840487f9c643f3972a59f25b367..3dd6f6f7a0988c97270bfe8ae2bd84abf9ecae64 100644 (file)
--- 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