You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
31 lines
1.1 KiB
31 lines
1.1 KiB
9 years ago
|
From 64a1905f49391e41e660dd5d079e2c61d5344920 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
|
||
|
|
Date: Sat, 30 Jan 2016 14:05:37 +0100
|
||
|
|
Subject: [PATCH] bgmac: support Ethernet device on BCM47094 SoC
|
||
|
|
|
||
|
|
It needs very similar workarounds to the one on BCM4707.
|
||
|
|
---
|
||
|
|
drivers/net/ethernet/broadcom/bgmac.c | 4 +++-
|
||
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
--- a/drivers/net/ethernet/broadcom/bgmac.c
|
||
|
|
+++ b/drivers/net/ethernet/broadcom/bgmac.c
|
||
|
|
@@ -30,6 +30,7 @@ static inline bool bgmac_is_bcm4707_fami
|
||
|
|
{
|
||
|
|
switch (bgmac->core->bus->chipinfo.id) {
|
||
|
|
case BCMA_CHIP_ID_BCM4707:
|
||
|
|
+ case BCMA_CHIP_ID_BCM47094:
|
||
|
|
case BCMA_CHIP_ID_BCM53018:
|
||
|
|
return true;
|
||
|
|
default:
|
||
|
|
@@ -1048,7 +1049,8 @@ static void bgmac_chip_reset(struct bgma
|
||
|
|
iost &= ~BGMAC_BCMA_IOST_ATTACHED;
|
||
|
|
|
||
|
|
/* 3GMAC: for BCM4707, only do core reset at bgmac_probe() */
|
||
|
|
- if (ci->id != BCMA_CHIP_ID_BCM4707) {
|
||
|
|
+ if (ci->id != BCMA_CHIP_ID_BCM4707 &&
|
||
|
|
+ ci->id != BCMA_CHIP_ID_BCM47094) {
|
||
|
|
flags = 0;
|
||
|
|
if (iost & BGMAC_BCMA_IOST_ATTACHED) {
|
||
|
|
flags = BGMAC_BCMA_IOCTL_SW_CLKEN;
|