e842e16f45
- Refresh all patches - Removed upstreamed - Adapted 1 Compile tested on: bcm53xx, cns3xxx, imx6, lantiq Run tested on: cns3xxx & imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com> [update from 4.9.28 to 4.9.29] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
26 lines
824 B
Diff
26 lines
824 B
Diff
--- a/drivers/net/dsa/mt7530.c
|
|
+++ b/drivers/net/dsa/mt7530.c
|
|
@@ -629,6 +629,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 */
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
@@ -221,6 +221,9 @@ static void mtk_phy_link_adjust(struct n
|
|
netif_carrier_on(dev);
|
|
else
|
|
netif_carrier_off(dev);
|
|
+
|
|
+ if (!of_phy_is_fixed_link(mac->of_node))
|
|
+ phy_print_status(dev->phydev);
|
|
}
|
|
|
|
static int mtk_phy_connect_node(struct mtk_eth *eth, struct mtk_mac *mac,
|