diff options
Diffstat (limited to 'target/linux/mvebu/patches-4.19/535-net-marvell-neta-add-comphy-support.patch')
| -rw-r--r-- | target/linux/mvebu/patches-4.19/535-net-marvell-neta-add-comphy-support.patch | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/target/linux/mvebu/patches-4.19/535-net-marvell-neta-add-comphy-support.patch b/target/linux/mvebu/patches-4.19/535-net-marvell-neta-add-comphy-support.patch index 257cfdec4a..272beb6950 100644 --- a/target/linux/mvebu/patches-4.19/535-net-marvell-neta-add-comphy-support.patch +++ b/target/linux/mvebu/patches-4.19/535-net-marvell-neta-add-comphy-support.patch @@ -23,7 +23,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> #include <linux/phy.h> #include <linux/phylink.h> #include <linux/platform_device.h> -@@ -436,6 +437,7 @@ struct mvneta_port { +@@ -438,6 +439,7 @@ struct mvneta_port { struct device_node *dn; unsigned int tx_csum_limit; struct phylink *phylink; @@ -31,7 +31,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> struct mvneta_bm *bm_priv; struct mvneta_bm_pool *pool_long; -@@ -3153,6 +3155,8 @@ static void mvneta_start_dev(struct mvne +@@ -3168,6 +3170,8 @@ static void mvneta_start_dev(struct mvne { int cpu; @@ -40,7 +40,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> mvneta_max_rx_size_set(pp, pp->pkt_size); mvneta_txq_max_tx_size_set(pp, pp->pkt_size); -@@ -3215,6 +3219,8 @@ static void mvneta_stop_dev(struct mvnet +@@ -3230,6 +3234,8 @@ static void mvneta_stop_dev(struct mvnet mvneta_tx_reset(pp); mvneta_rx_reset(pp); @@ -49,7 +49,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> } static void mvneta_percpu_enable(void *arg) -@@ -3340,6 +3346,7 @@ static int mvneta_set_mac_addr(struct ne +@@ -3355,6 +3361,7 @@ static int mvneta_set_mac_addr(struct ne static void mvneta_validate(struct net_device *ndev, unsigned long *supported, struct phylink_link_state *state) { @@ -57,7 +57,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> __ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, }; /* We only support QSGMII, SGMII, 802.3z and RGMII modes */ -@@ -3360,8 +3367,13 @@ static void mvneta_validate(struct net_d +@@ -3375,8 +3382,13 @@ static void mvneta_validate(struct net_d phylink_set(mask, Pause); /* Half-duplex at speeds higher than 100Mbit is unsupported */ @@ -73,7 +73,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> if (!phy_interface_mode_is_8023z(state->interface)) { /* 10M and 100M are only supported in non-802.3z mode */ -@@ -3375,6 +3387,11 @@ static void mvneta_validate(struct net_d +@@ -3390,6 +3402,11 @@ static void mvneta_validate(struct net_d __ETHTOOL_LINK_MODE_MASK_NBITS); bitmap_and(state->advertising, state->advertising, mask, __ETHTOOL_LINK_MODE_MASK_NBITS); @@ -85,7 +85,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> } static int mvneta_mac_link_state(struct net_device *ndev, -@@ -3386,7 +3403,9 @@ static int mvneta_mac_link_state(struct +@@ -3401,7 +3418,9 @@ static int mvneta_mac_link_state(struct gmac_stat = mvreg_read(pp, MVNETA_GMAC_STATUS); if (gmac_stat & MVNETA_GMAC_SPEED_1000) @@ -96,7 +96,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> else if (gmac_stat & MVNETA_GMAC_SPEED_100) state->speed = SPEED_100; else -@@ -3501,12 +3520,20 @@ static void mvneta_mac_config(struct net +@@ -3516,12 +3535,20 @@ static void mvneta_mac_config(struct net MVNETA_GMAC_FORCE_LINK_DOWN); } @@ -117,7 +117,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> if (new_ctrl0 != gmac_ctrl0) mvreg_write(pp, MVNETA_GMAC_CTRL_0, new_ctrl0); if (new_ctrl2 != gmac_ctrl2) -@@ -4419,7 +4446,7 @@ static int mvneta_port_power_up(struct m +@@ -4434,7 +4461,7 @@ static int mvneta_port_power_up(struct m if (phy_mode == PHY_INTERFACE_MODE_QSGMII) mvreg_write(pp, MVNETA_SERDES_CFG, MVNETA_QSGMII_SERDES_PROTO); else if (phy_mode == PHY_INTERFACE_MODE_SGMII || @@ -126,7 +126,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> mvreg_write(pp, MVNETA_SERDES_CFG, MVNETA_SGMII_SERDES_PROTO); else if (!phy_interface_mode_is_rgmii(phy_mode)) return -EINVAL; -@@ -4436,6 +4463,7 @@ static int mvneta_probe(struct platform_ +@@ -4451,6 +4478,7 @@ static int mvneta_probe(struct platform_ struct mvneta_port *pp; struct net_device *dev; struct phylink *phylink; @@ -134,7 +134,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> const char *dt_mac_addr; char hw_mac_addr[ETH_ALEN]; const char *mac_from; -@@ -4461,6 +4489,14 @@ static int mvneta_probe(struct platform_ +@@ -4476,6 +4504,14 @@ static int mvneta_probe(struct platform_ goto err_free_irq; } @@ -149,7 +149,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> phylink = phylink_create(dev, pdev->dev.fwnode, phy_mode, &mvneta_phylink_ops); if (IS_ERR(phylink)) { -@@ -4477,6 +4513,7 @@ static int mvneta_probe(struct platform_ +@@ -4492,6 +4528,7 @@ static int mvneta_probe(struct platform_ pp = netdev_priv(dev); spin_lock_init(&pp->lock); pp->phylink = phylink; |