kernel: update 4.4 to 4.4.83
[openwrt/openwrt.git] / target / linux / mediatek / patches-4.9 / 0095-ephy.patch
1 --- a/drivers/net/dsa/mt7530.c
2 +++ b/drivers/net/dsa/mt7530.c
3 @@ -629,6 +629,11 @@ mt7530_setup(struct dsa_switch *ds)
4 val = mt7530_read(priv, MT7530_MHWTRAP);
5 val &= ~MHWTRAP_P6_DIS & ~MHWTRAP_PHY_ACCESS;
6 val |= MHWTRAP_MANUAL;
7 + if (!dsa_is_cpu_port(ds, 5)) {
8 + val |= MHWTRAP_P5_DIS;
9 + val |= MHWTRAP_P5_MAC_SEL;
10 + val |= MHWTRAP_P5_RGMII_MODE;
11 + }
12 mt7530_write(priv, MT7530_MHWTRAP, val);
13
14 /* Enable and reset MIB counters */
15 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
16 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
17 @@ -221,6 +221,9 @@ static void mtk_phy_link_adjust(struct n
18 netif_carrier_on(dev);
19 else
20 netif_carrier_off(dev);
21 +
22 + if (!of_phy_is_fixed_link(mac->of_node))
23 + phy_print_status(dev->phydev);
24 }
25
26 static int mtk_phy_connect_node(struct mtk_eth *eth, struct mtk_mac *mac,