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-13-bgmac-fix-MAC-soft-reset-bit-for-corerev-4.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-13-bgmac-fix-MAC-soft-reset-bit-for-corerev-4.patch')
-rw-r--r-- | target/linux/generic/patches-3.18/077-13-bgmac-fix-MAC-soft-reset-bit-for-corerev-4.patch | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/target/linux/generic/patches-3.18/077-13-bgmac-fix-MAC-soft-reset-bit-for-corerev-4.patch b/target/linux/generic/patches-3.18/077-13-bgmac-fix-MAC-soft-reset-bit-for-corerev-4.patch deleted file mode 100644 index a3d9fd6cd9..0000000000 --- a/target/linux/generic/patches-3.18/077-13-bgmac-fix-MAC-soft-reset-bit-for-corerev-4.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Felix Fietkau <nbd@openwrt.org> -Date: Mon, 13 Apr 2015 15:54:04 +0200 -Subject: [PATCH] bgmac: fix MAC soft-reset bit for corerev > 4 - -Only core revisions older than 4 use BGMAC_CMDCFG_SR_REV0 - -Signed-off-by: Felix Fietkau <nbd@openwrt.org> ---- - ---- a/drivers/net/ethernet/broadcom/bgmac.h -+++ b/drivers/net/ethernet/broadcom/bgmac.h -@@ -198,9 +198,9 @@ - #define BGMAC_CMDCFG_TAI 0x00000200 - #define BGMAC_CMDCFG_HD 0x00000400 /* Set if in half duplex mode */ - #define BGMAC_CMDCFG_HD_SHIFT 10 --#define BGMAC_CMDCFG_SR_REV0 0x00000800 /* Set to reset mode, for other revs */ --#define BGMAC_CMDCFG_SR_REV4 0x00002000 /* Set to reset mode, only for core rev 4 */ --#define BGMAC_CMDCFG_SR(rev) ((rev == 4) ? BGMAC_CMDCFG_SR_REV4 : BGMAC_CMDCFG_SR_REV0) -+#define BGMAC_CMDCFG_SR_REV0 0x00000800 /* Set to reset mode, for core rev 0-3 */ -+#define BGMAC_CMDCFG_SR_REV4 0x00002000 /* Set to reset mode, for core rev >= 4 */ -+#define BGMAC_CMDCFG_SR(rev) ((rev >= 4) ? BGMAC_CMDCFG_SR_REV4 : BGMAC_CMDCFG_SR_REV0) - #define BGMAC_CMDCFG_ML 0x00008000 /* Set to activate mac loopback mode */ - #define BGMAC_CMDCFG_AE 0x00400000 - #define BGMAC_CMDCFG_CFE 0x00800000 |