diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2016-01-02 14:48:27 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2016-01-02 14:48:27 +0000 |
| commit | c69ffda546522ae67544ad717a45abbc2ca3527f (patch) | |
| tree | fb2de31fd6d40b87d35e63d5b8e01a03e9f0bbf8 /target/linux/ramips/patches-4.3/0511-net-mediatek-add-support-for-the-multiphy-carrier-pa.patch | |
| parent | 140be9f1a5915e952722813e60716a257d622f74 (diff) | |
| download | mtk-20170518-c69ffda546522ae67544ad717a45abbc2ca3527f.zip mtk-20170518-c69ffda546522ae67544ad717a45abbc2ca3527f.tar.gz mtk-20170518-c69ffda546522ae67544ad717a45abbc2ca3527f.tar.bz2 | |
ramips: clean up and refresh kernel patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 48070
Diffstat (limited to 'target/linux/ramips/patches-4.3/0511-net-mediatek-add-support-for-the-multiphy-carrier-pa.patch')
| -rw-r--r-- | target/linux/ramips/patches-4.3/0511-net-mediatek-add-support-for-the-multiphy-carrier-pa.patch | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/target/linux/ramips/patches-4.3/0511-net-mediatek-add-support-for-the-multiphy-carrier-pa.patch b/target/linux/ramips/patches-4.3/0511-net-mediatek-add-support-for-the-multiphy-carrier-pa.patch index 349662f..4d5c2d8 100644 --- a/target/linux/ramips/patches-4.3/0511-net-mediatek-add-support-for-the-multiphy-carrier-pa.patch +++ b/target/linux/ramips/patches-4.3/0511-net-mediatek-add-support-for-the-multiphy-carrier-pa.patch @@ -13,11 +13,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org> drivers/net/ethernet/mediatek/mdio_mt7620.c | 12 ++++++++++++ 5 files changed, 16 insertions(+) -diff --git a/drivers/net/ethernet/mediatek/gsw_mt7620.c b/drivers/net/ethernet/mediatek/gsw_mt7620.c -index a37ed1b..28122ac 100644 --- a/drivers/net/ethernet/mediatek/gsw_mt7620.c +++ b/drivers/net/ethernet/mediatek/gsw_mt7620.c -@@ -54,6 +54,7 @@ static irqreturn_t gsw_interrupt_mt7620(int irq, void *_priv) +@@ -54,6 +54,7 @@ static irqreturn_t gsw_interrupt_mt7620( priv->link[i] = link; } @@ -25,22 +23,18 @@ index a37ed1b..28122ac 100644 mtk_switch_w32(gsw, status, GSW_REG_ISR); return IRQ_HANDLED; -diff --git a/drivers/net/ethernet/mediatek/gsw_mt7620.h b/drivers/net/ethernet/mediatek/gsw_mt7620.h -index 0d6ee84..dcef9a8 100644 --- a/drivers/net/ethernet/mediatek/gsw_mt7620.h +++ b/drivers/net/ethernet/mediatek/gsw_mt7620.h -@@ -113,5 +113,6 @@ u32 mt7530_mdio_r32(struct mt7620_gsw *gsw, u32 reg); +@@ -113,5 +113,6 @@ u32 mt7530_mdio_r32(struct mt7620_gsw *g u32 _mt7620_mii_write(struct mt7620_gsw *gsw, u32 phy_addr, u32 phy_register, u32 write_data); u32 _mt7620_mii_read(struct mt7620_gsw *gsw, int phy_addr, int phy_reg); +void mt7620_handle_carrier(struct fe_priv *priv); #endif -diff --git a/drivers/net/ethernet/mediatek/gsw_mt7621.c b/drivers/net/ethernet/mediatek/gsw_mt7621.c -index 500841f..dc349ef 100644 --- a/drivers/net/ethernet/mediatek/gsw_mt7621.c +++ b/drivers/net/ethernet/mediatek/gsw_mt7621.c -@@ -60,6 +60,7 @@ static irqreturn_t gsw_interrupt_mt7621(int irq, void *_priv) +@@ -60,6 +60,7 @@ static irqreturn_t gsw_interrupt_mt7621( } } @@ -48,11 +42,9 @@ index 500841f..dc349ef 100644 mt7530_mdio_w32(gsw, 0x700c, 0x1f); return IRQ_HANDLED; -diff --git a/drivers/net/ethernet/mediatek/mdio.c b/drivers/net/ethernet/mediatek/mdio.c -index 169c937..79a946e 100644 --- a/drivers/net/ethernet/mediatek/mdio.c +++ b/drivers/net/ethernet/mediatek/mdio.c -@@ -89,6 +89,7 @@ int fe_connect_phy_node(struct fe_priv *priv, struct device_node *phy_node) +@@ -89,6 +89,7 @@ int fe_connect_phy_node(struct fe_priv * phydev->supported &= PHY_GBIT_FEATURES; phydev->advertising = phydev->supported; @@ -60,11 +52,9 @@ index 169c937..79a946e 100644 dev_info(priv->device, "connected port %d to PHY at %s [uid=%08x, driver=%s]\n", -diff --git a/drivers/net/ethernet/mediatek/mdio_mt7620.c b/drivers/net/ethernet/mediatek/mdio_mt7620.c -index 89c6c30..db6db52 100644 --- a/drivers/net/ethernet/mediatek/mdio_mt7620.c +++ b/drivers/net/ethernet/mediatek/mdio_mt7620.c -@@ -137,6 +137,17 @@ int mt7620_has_carrier(struct fe_priv *priv) +@@ -137,6 +137,17 @@ int mt7620_has_carrier(struct fe_priv *p } @@ -82,12 +72,9 @@ index 89c6c30..db6db52 100644 void mt7620_print_link_state(struct fe_priv *priv, int port, int link, int speed, int duplex) { -@@ -153,4 +164,5 @@ void mt7620_mdio_link_adjust(struct fe_priv *priv, int port) +@@ -153,4 +164,5 @@ void mt7620_mdio_link_adjust(struct fe_p mt7620_print_link_state(priv, port, priv->link[port], priv->phy->speed[port], (priv->phy->duplex[port] == DUPLEX_FULL)); + mt7620_handle_carrier(priv); } --- -1.7.10.4 - |