net: dsa: felix: stop calling ocelot_port_{enable,disable}

[mirror_ubuntu-jammy-kernel.git] / drivers / net / ethernet / mscc / ocelot.c

diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c
index adfb9781799eecfd0890dd979d37335eb71b2758..a948c807349d214dc6da3d63c6a6188a8c5534ac 100644 (file)
--- a/drivers/net/ethernet/mscc/ocelot.c
+++ b/drivers/net/ethernet/mscc/ocelot.c
@@ -514,19 +514,6 @@ void ocelot_adjust_link(struct ocelot *ocelot, int port,
 }
 EXPORT_SYMBOL(ocelot_adjust_link);
 
-void ocelot_port_enable(struct ocelot *ocelot, int port,
-                       struct phy_device *phy)
-{
-       /* Enable receiving frames on the port, and activate auto-learning of
-        * MAC addresses.
-        */
-       ocelot_write_gix(ocelot, ANA_PORT_PORT_CFG_LEARNAUTO |
-                        ANA_PORT_PORT_CFG_RECV_ENA |
-                        ANA_PORT_PORT_CFG_PORTID_VAL(port),
-                        ANA_PORT_PORT_CFG, port);
-}
-EXPORT_SYMBOL(ocelot_port_enable);
-
 void ocelot_port_disable(struct ocelot *ocelot, int port)
 {
        struct ocelot_port *ocelot_port = ocelot->ports[port];
@@ -1956,6 +1943,15 @@ void ocelot_init_port(struct ocelot *ocelot, int port)
        /* Disable source address learning for standalone mode */
        ocelot_port_set_learning(ocelot, port, false);
 
+       /* Set the port's initial logical port ID value, enable receiving
+        * frames on it, and configure the MAC address learning type to
+        * automatic.
+        */
+       ocelot_write_gix(ocelot, ANA_PORT_PORT_CFG_LEARNAUTO |
+                        ANA_PORT_PORT_CFG_RECV_ENA |
+                        ANA_PORT_PORT_CFG_PORTID_VAL(port),
+                        ANA_PORT_PORT_CFG, port);
+
        /* Enable vcap lookups */
        ocelot_vcap_enable(ocelot, port);
 }