kernel: replace bgmac patches for BCM47094 with final ones
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 48756v19.07.3_mercusys_ac12_duma
parent
319863f60e
commit
9e9617a864
@ -0,0 +1,39 @@
|
||||
From 9e4e6206c67ae11d68fc96882256f37c237087d4 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
|
||||
Date: Mon, 22 Feb 2016 22:51:13 +0100
|
||||
Subject: [PATCH] bgmac: support Ethernet device on BCM47094 SoC
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
It needs very similar workarounds to the one on BCM4707. It was tested
|
||||
on D-Link DIR-885L home router.
|
||||
|
||||
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
|
||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
---
|
||||
drivers/net/ethernet/broadcom/bgmac.c | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
--- 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:
|
||||
@@ -1047,8 +1048,9 @@ static void bgmac_chip_reset(struct bgma
|
||||
(ci->id == BCMA_CHIP_ID_BCM53572 && ci->pkg == BCMA_PKG_ID_BCM47188))
|
||||
iost &= ~BGMAC_BCMA_IOST_ATTACHED;
|
||||
|
||||
- /* 3GMAC: for BCM4707, only do core reset at bgmac_probe() */
|
||||
- if (ci->id != BCMA_CHIP_ID_BCM4707) {
|
||||
+ /* 3GMAC: for BCM4707 & BCM47094, only do core reset at bgmac_probe() */
|
||||
+ 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;
|
@ -1,30 +0,0 @@
|
||||
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;
|
Loading…
Reference in New Issue