diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2015-02-11 18:06:34 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-02-11 19:44:21 -0800 |
| commit | 21697336d46b71dd031f29e426dda0b1e7f06cc0 (patch) | |
| tree | eb69ce4a106b3e73c808654b55be51a847f4ad6d /drivers/net/ethernet | |
| parent | fe79fabbed056d081d6130cbd83e5b2fc42c3c52 (diff) | |
| download | blackbird-obmc-linux-21697336d46b71dd031f29e426dda0b1e7f06cc0.tar.gz blackbird-obmc-linux-21697336d46b71dd031f29e426dda0b1e7f06cc0.zip | |
bgmac: fix device initialization on Northstar SoCs (condition typo)
On Northstar (Broadcom's ARM architecture) we need to manually enable
all cores. Code for that is already in place, but the condition for it
was wrong.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bgmac.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c index ea63cb085d19..676ffe093180 100644 --- a/drivers/net/ethernet/broadcom/bgmac.c +++ b/drivers/net/ethernet/broadcom/bgmac.c @@ -1412,6 +1412,7 @@ static void bgmac_mii_unregister(struct bgmac *bgmac) /* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipattach */ static int bgmac_probe(struct bcma_device *core) { + struct bcma_chipinfo *ci = &core->bus->chipinfo; struct net_device *net_dev; struct bgmac *bgmac; struct ssb_sprom *sprom = &core->bus->sprom; @@ -1474,8 +1475,8 @@ static int bgmac_probe(struct bcma_device *core) bgmac_chip_reset(bgmac); /* For Northstar, we have to take all GMAC core out of reset */ - 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) { struct bcma_device *ns_core; int ns_gmac; |
