Skip to content

Commit 2169733

Browse files
rmileckidavem330
authored andcommitted
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 <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent fe79fab commit 2169733

File tree

1 file changed

+3
-2
lines changed
  • drivers/net/ethernet/broadcom

1 file changed

+3
-2
lines changed

drivers/net/ethernet/broadcom/bgmac.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1412,6 +1412,7 @@ static void bgmac_mii_unregister(struct bgmac *bgmac)
14121412
/* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipattach */
14131413
static int bgmac_probe(struct bcma_device *core)
14141414
{
1415+
struct bcma_chipinfo *ci = &core->bus->chipinfo;
14151416
struct net_device *net_dev;
14161417
struct bgmac *bgmac;
14171418
struct ssb_sprom *sprom = &core->bus->sprom;
@@ -1474,8 +1475,8 @@ static int bgmac_probe(struct bcma_device *core)
14741475
bgmac_chip_reset(bgmac);
14751476

14761477
/* For Northstar, we have to take all GMAC core out of reset */
1477-
if (core->id.id == BCMA_CHIP_ID_BCM4707 ||
1478-
core->id.id == BCMA_CHIP_ID_BCM53018) {
1478+
if (ci->id == BCMA_CHIP_ID_BCM4707 ||
1479+
ci->id == BCMA_CHIP_ID_BCM53018) {
14791480
struct bcma_device *ns_core;
14801481
int ns_gmac;
14811482

0 commit comments

Comments
 (0)