diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2016-04-15 10:11:31 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2016-04-15 10:11:31 +0000 |
| commit | 490861a3f5d93e7cec274bce67bad56c909c09a8 (patch) | |
| tree | a0240057c7734b35f69782e2cdfe488cd0f0b077 /target/linux/generic/patches-3.18/077-14-bgmac-reset-all-4-GMAC-cores-on-init.patch | |
| parent | d30766c9865de0097df38a7ec55ad92c1879b0da (diff) | |
| download | upstream-490861a3f5d93e7cec274bce67bad56c909c09a8.tar.gz upstream-490861a3f5d93e7cec274bce67bad56c909c09a8.tar.bz2 upstream-490861a3f5d93e7cec274bce67bad56c909c09a8.zip | |
kernel: use upstream fixes for bgmac and BCM4709(4)
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 49167
Diffstat (limited to 'target/linux/generic/patches-3.18/077-14-bgmac-reset-all-4-GMAC-cores-on-init.patch')
| -rw-r--r-- | target/linux/generic/patches-3.18/077-14-bgmac-reset-all-4-GMAC-cores-on-init.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/target/linux/generic/patches-3.18/077-14-bgmac-reset-all-4-GMAC-cores-on-init.patch b/target/linux/generic/patches-3.18/077-14-bgmac-reset-all-4-GMAC-cores-on-init.patch deleted file mode 100644 index 2a913a60e7..0000000000 --- a/target/linux/generic/patches-3.18/077-14-bgmac-reset-all-4-GMAC-cores-on-init.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Felix Fietkau <nbd@openwrt.org> -Date: Mon, 13 Apr 2015 15:56:26 +0200 -Subject: [PATCH] bgmac: reset all 4 GMAC cores on init - -On a BCM4709 based device, I found that GMAC cores may be enabled at -probe time, but only become usable after a full reset. -Disable cores before re-enabling them to ensure that they are properly -reset. - -Signed-off-by: Felix Fietkau <nbd@openwrt.org> ---- - ---- a/drivers/net/ethernet/broadcom/bgmac.c -+++ b/drivers/net/ethernet/broadcom/bgmac.c -@@ -1623,8 +1623,11 @@ static int bgmac_probe(struct bcma_devic - ns_core = bcma_find_core_unit(core->bus, - BCMA_CORE_MAC_GBIT, - ns_gmac); -- if (ns_core && !bcma_core_is_enabled(ns_core)) -- bcma_core_enable(ns_core, 0); -+ if (!ns_core) -+ continue; -+ -+ bcma_core_disable(ns_core, 0); -+ bcma_core_enable(ns_core, 0); - } - } - |