net: mvpp2: Replace PHY_INTERFACE_MODE_SFI with 5GBASER/10GBASER/XAUI

Replace PHY_INTERFACE_MODE_SFI with PHY_INTERFACE_MODE_5GBASER,
PHY_INTERFACE_MODE_10GBASER and PHY_INTERFACE_MODE_XAUI to match
Linux PHY interface modes.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Reviewed-by: Ramon Fried <rfried.dev@gmail.com>

diff --git a/drivers/net/mvpp2.c b/drivers/net/mvpp2.c
index c99d52c85d72d01db5fa5a6c43d4726f03b07401..f407d8f6a8113432928e52bf3797e0710c9c45f9 100644 (file)
--- a/drivers/net/mvpp2.c
+++ b/drivers/net/mvpp2.c
@@ -3391,7 +3391,9 @@ static int gop_port_init(struct mvpp2_port *port)
                gop_gmac_reset(port, 0);
                break;
 
-       case PHY_INTERFACE_MODE_SFI:
+       case PHY_INTERFACE_MODE_10GBASER:
+       case PHY_INTERFACE_MODE_5GBASER:
+       case PHY_INTERFACE_MODE_XAUI:
                num_of_act_lanes = 2;
                mac_num = 0;
                /* configure PCS */
@@ -3442,7 +3444,9 @@ static void gop_port_enable(struct mvpp2_port *port, int enable)
                        mvpp2_port_disable(port);
                break;
 
-       case PHY_INTERFACE_MODE_SFI:
+       case PHY_INTERFACE_MODE_10GBASER:
+       case PHY_INTERFACE_MODE_5GBASER:
+       case PHY_INTERFACE_MODE_XAUI:
                gop_xlg_mac_port_enable(port, enable);
 
                break;

diff --git a/include/phy_interface.h b/include/phy_interface.h
index fed3357b9a26f55191efa5fd3a286135d72e8d63..52af7e612b69c15a03c2d824a649c21e84da94dd 100644 (file)
--- a/include/phy_interface.h
+++ b/include/phy_interface.h
@@ -31,6 +31,7 @@ typedef enum {
        PHY_INTERFACE_MODE_XGMII,
        PHY_INTERFACE_MODE_XAUI,
        PHY_INTERFACE_MODE_RXAUI,
+       PHY_INTERFACE_MODE_5GBASER,
        PHY_INTERFACE_MODE_SFI,
        PHY_INTERFACE_MODE_INTERNAL,
        PHY_INTERFACE_MODE_25G_AUI,
@@ -62,6 +63,7 @@ static const char * const phy_interface_strings[] = {
        [PHY_INTERFACE_MODE_XGMII]              = "xgmii",
        [PHY_INTERFACE_MODE_XAUI]               = "xaui",
        [PHY_INTERFACE_MODE_RXAUI]              = "rxaui",
+       [PHY_INTERFACE_MODE_5GBASER]            = "5gbase-r",
        [PHY_INTERFACE_MODE_SFI]                = "sfi",
        [PHY_INTERFACE_MODE_INTERNAL]           = "internal",
        [PHY_INTERFACE_MODE_25G_AUI]            = "25g-aui",