| 12345678910111213141516171819202122232425262728293031323334353637383940 |
- From 21697336d46b71dd031f29e426dda0b1e7f06cc0 Mon Sep 17 00:00:00 2001
- From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
- Date: Wed, 11 Feb 2015 18:06:34 +0100
- Subject: [PATCH] bgmac: fix device initialization on Northstar SoCs (condition
- typo)
- MIME-Version: 1.0
- Content-Type: text/plain; charset=UTF-8
- Content-Transfer-Encoding: 8bit
- 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>
- ---
- drivers/net/ethernet/broadcom/bgmac.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
- --- a/drivers/net/ethernet/broadcom/bgmac.c
- +++ b/drivers/net/ethernet/broadcom/bgmac.c
- @@ -1412,6 +1412,7 @@ static void bgmac_mii_unregister(struct
- /* 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_devic
- 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;
-
|
