1 From 6543b4cef96c12903f5ec5c015cd223a6b3c9a33 Mon Sep 17 00:00:00 2001
2 From: John Crispin <blogic@openwrt.org>
3 Date: Mon, 14 Dec 2015 21:16:59 +0100
4 Subject: [PATCH 511/513] net: mediatek: add support for the multiphy carrier
7 Signed-off-by: John Crispin <blogic@openwrt.org>
9 drivers/net/ethernet/mediatek/gsw_mt7620.c | 1 +
10 drivers/net/ethernet/mediatek/gsw_mt7620.h | 1 +
11 drivers/net/ethernet/mediatek/gsw_mt7621.c | 1 +
12 drivers/net/ethernet/mediatek/mdio.c | 1 +
13 drivers/net/ethernet/mediatek/mdio_mt7620.c | 12 ++++++++++++
14 5 files changed, 16 insertions(+)
16 diff --git a/drivers/net/ethernet/mediatek/gsw_mt7620.c b/drivers/net/ethernet/mediatek/gsw_mt7620.c
17 index a37ed1b..28122ac 100644
18 --- a/drivers/net/ethernet/mediatek/gsw_mt7620.c
19 +++ b/drivers/net/ethernet/mediatek/gsw_mt7620.c
20 @@ -54,6 +54,7 @@ static irqreturn_t gsw_interrupt_mt7620(int irq, void *_priv)
24 + mt7620_handle_carrier(priv);
25 mtk_switch_w32(gsw, status, GSW_REG_ISR);
28 diff --git a/drivers/net/ethernet/mediatek/gsw_mt7620.h b/drivers/net/ethernet/mediatek/gsw_mt7620.h
29 index 0d6ee84..dcef9a8 100644
30 --- a/drivers/net/ethernet/mediatek/gsw_mt7620.h
31 +++ b/drivers/net/ethernet/mediatek/gsw_mt7620.h
32 @@ -113,5 +113,6 @@ u32 mt7530_mdio_r32(struct mt7620_gsw *gsw, u32 reg);
33 u32 _mt7620_mii_write(struct mt7620_gsw *gsw, u32 phy_addr,
34 u32 phy_register, u32 write_data);
35 u32 _mt7620_mii_read(struct mt7620_gsw *gsw, int phy_addr, int phy_reg);
36 +void mt7620_handle_carrier(struct fe_priv *priv);
39 diff --git a/drivers/net/ethernet/mediatek/gsw_mt7621.c b/drivers/net/ethernet/mediatek/gsw_mt7621.c
40 index 500841f..dc349ef 100644
41 --- a/drivers/net/ethernet/mediatek/gsw_mt7621.c
42 +++ b/drivers/net/ethernet/mediatek/gsw_mt7621.c
43 @@ -60,6 +60,7 @@ static irqreturn_t gsw_interrupt_mt7621(int irq, void *_priv)
47 + mt7620_handle_carrier(priv);
48 mt7530_mdio_w32(gsw, 0x700c, 0x1f);
51 diff --git a/drivers/net/ethernet/mediatek/mdio.c b/drivers/net/ethernet/mediatek/mdio.c
52 index 169c937..79a946e 100644
53 --- a/drivers/net/ethernet/mediatek/mdio.c
54 +++ b/drivers/net/ethernet/mediatek/mdio.c
55 @@ -89,6 +89,7 @@ int fe_connect_phy_node(struct fe_priv *priv, struct device_node *phy_node)
57 phydev->supported &= PHY_GBIT_FEATURES;
58 phydev->advertising = phydev->supported;
59 + phydev->no_auto_carrier_off = 1;
61 dev_info(priv->device,
62 "connected port %d to PHY at %s [uid=%08x, driver=%s]\n",
63 diff --git a/drivers/net/ethernet/mediatek/mdio_mt7620.c b/drivers/net/ethernet/mediatek/mdio_mt7620.c
64 index 89c6c30..db6db52 100644
65 --- a/drivers/net/ethernet/mediatek/mdio_mt7620.c
66 +++ b/drivers/net/ethernet/mediatek/mdio_mt7620.c
67 @@ -137,6 +137,17 @@ int mt7620_has_carrier(struct fe_priv *priv)
71 +void mt7620_handle_carrier(struct fe_priv *priv)
76 + if (mt7620_has_carrier(priv))
77 + netif_carrier_on(priv->netdev);
79 + netif_carrier_off(priv->netdev);
82 void mt7620_print_link_state(struct fe_priv *priv, int port, int link,
83 int speed, int duplex)
85 @@ -153,4 +164,5 @@ void mt7620_mdio_link_adjust(struct fe_priv *priv, int port)
86 mt7620_print_link_state(priv, port, priv->link[port],
87 priv->phy->speed[port],
88 (priv->phy->duplex[port] == DUPLEX_FULL));
89 + mt7620_handle_carrier(priv);