diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2016-02-24 22:43:43 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2016-02-24 22:43:43 +0000 |
| commit | 9e9617a864c2dcb886ca8cd1b1e009e8841c8e8b (patch) | |
| tree | acbbc2867a734a77bb6ffcc30ba2cf542c47ab18 /target/linux/generic/patches-4.4/771-bgmac-support-Ethernet-device-on-BCM47094-SoC.patch | |
| parent | 319863f60e7fdd170bcd15720a5bc2d18dbe2cbc (diff) | |
| download | upstream-9e9617a864c2dcb886ca8cd1b1e009e8841c8e8b.tar.gz upstream-9e9617a864c2dcb886ca8cd1b1e009e8841c8e8b.tar.bz2 upstream-9e9617a864c2dcb886ca8cd1b1e009e8841c8e8b.zip | |
kernel: replace bgmac patches for BCM47094 with final ones
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 48756
Diffstat (limited to 'target/linux/generic/patches-4.4/771-bgmac-support-Ethernet-device-on-BCM47094-SoC.patch')
| -rw-r--r-- | target/linux/generic/patches-4.4/771-bgmac-support-Ethernet-device-on-BCM47094-SoC.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/target/linux/generic/patches-4.4/771-bgmac-support-Ethernet-device-on-BCM47094-SoC.patch b/target/linux/generic/patches-4.4/771-bgmac-support-Ethernet-device-on-BCM47094-SoC.patch deleted file mode 100644 index f3592204c2..0000000000 --- a/target/linux/generic/patches-4.4/771-bgmac-support-Ethernet-device-on-BCM47094-SoC.patch +++ /dev/null @@ -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; |