Commit ba68e994 authored by Colin Foster's avatar Colin Foster Committed by David S. Miller
Browse files

net: mscc: ocelot: remove buggy duplicate write to DEV_CLOCK_CFG 



When updating ocelot to use phylink, a second write to DEV_CLOCK_CFG was
mistakenly left in. It used the variable "speed" which, previously, would
would have been assigned a value of OCELOT_SPEED_1000. In phylink the
variable is be SPEED_1000, which is invalid for the
DEV_CLOCK_LINK_SPEED macro. Removing it as unnecessary and buggy.

Fixes: e6e12df6 ("net: mscc: ocelot: convert to phylink")
Signed-off-by: default avatarColin Foster <colin.foster@in-advantage.com>
Reviewed-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 163957c4

drivers/net/ethernet/mscc/ocelot.c

+0 −6
Original line number Diff line number Diff line
@@ -563,12 +563,6 @@ void ocelot_phylink_mac_link_up(struct ocelot *ocelot, int port, 
	ocelot_port_writel(ocelot_port, DEV_MAC_ENA_CFG_RX_ENA |

			   DEV_MAC_ENA_CFG_TX_ENA, DEV_MAC_ENA_CFG);



	/* Take MAC, Port, Phy (intern) and PCS (SGMII/Serdes) clock out of

	 * reset

	 */

	ocelot_port_writel(ocelot_port, DEV_CLOCK_CFG_LINK_SPEED(speed),

			   DEV_CLOCK_CFG);



	/* Core: Enable port for frame transfer */

	ocelot_fields_write(ocelot, port,

			    QSYS_SWITCH_PORT_MODE_PORT_ENA, 1);