mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-11-04 06:54:27 -05:00
88ba41453d
Refresh patches. Remove upstreamed patches: - backport/080-v4.15-0001-arch-define-weak-abort.patch - backport/081-v4.15-0002-kernel-exit.c-export-abort-to-modules.patch Update patch that no longer applies: pending/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch Fixes CVE-2017-8824. Compile-tested: octeon, x86/64. Runtime-tested: octeon, x86/64. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
27 lines
869 B
Diff
27 lines
869 B
Diff
From 52e9ce30a2b3c414e0efb20632fefa7cfc5096e6 Mon Sep 17 00:00:00 2001
|
|
From: John Crispin <john@phrozen.org>
|
|
Date: Thu, 10 Aug 2017 14:44:18 +0200
|
|
Subject: [PATCH 32/57] net: dsa: mediatek: add support for GMAC2 wired to ext
|
|
phy
|
|
|
|
Signed-off-by: John Crispin <john@phrozen.org>
|
|
---
|
|
drivers/net/dsa/mt7530.c | 5 +++++
|
|
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 3 +++
|
|
2 files changed, 8 insertions(+)
|
|
|
|
--- a/drivers/net/dsa/mt7530.c
|
|
+++ b/drivers/net/dsa/mt7530.c
|
|
@@ -991,6 +991,11 @@ mt7530_setup(struct dsa_switch *ds)
|
|
val = mt7530_read(priv, MT7530_MHWTRAP);
|
|
val &= ~MHWTRAP_P6_DIS & ~MHWTRAP_PHY_ACCESS;
|
|
val |= MHWTRAP_MANUAL;
|
|
+ if (!dsa_is_cpu_port(ds, 5)) {
|
|
+ val |= MHWTRAP_P5_DIS;
|
|
+ val |= MHWTRAP_P5_MAC_SEL;
|
|
+ val |= MHWTRAP_P5_RGMII_MODE;
|
|
+ }
|
|
mt7530_write(priv, MT7530_MHWTRAP, val);
|
|
|
|
/* Enable and reset MIB counters */
|