Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21697336 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by David S. Miller
Browse files

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: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fe79fabb

drivers/net/ethernet/broadcom/bgmac.c

+3 −2
Original line number Diff line number Diff line
@@ -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;