Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[sfrench/cifs-2.6.git] / drivers / net / ethernet / freescale / dpaa2 / dpaa2-mac.c

diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
index d860d9fe73af05c1f165d0dd50d9aed8e0389257..a69bb22c37eaba5248ab5789a32f1db9e2b41351 100644 (file)
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
@@ -54,6 +54,9 @@ static int phy_mode(enum dpmac_eth_if eth_if, phy_interface_t *if_mode)
        case DPMAC_ETH_IF_XFI:
                *if_mode = PHY_INTERFACE_MODE_10GBASER;
                break;
+       case DPMAC_ETH_IF_CAUI:
+               *if_mode = PHY_INTERFACE_MODE_25GBASER;
+               break;
        default:
                return -EINVAL;
        }
@@ -79,6 +82,8 @@ static enum dpmac_eth_if dpmac_eth_if_mode(phy_interface_t if_mode)
                return DPMAC_ETH_IF_XFI;
        case PHY_INTERFACE_MODE_1000BASEX:
                return DPMAC_ETH_IF_1000BASEX;
+       case PHY_INTERFACE_MODE_25GBASER:
+               return DPMAC_ETH_IF_CAUI;
        default:
                return DPMAC_ETH_IF_MII;
        }
@@ -415,7 +420,7 @@ int dpaa2_mac_connect(struct dpaa2_mac *mac)
 
        mac->phylink_config.mac_capabilities = MAC_SYM_PAUSE | MAC_ASYM_PAUSE |
                MAC_10FD | MAC_100FD | MAC_1000FD | MAC_2500FD | MAC_5000FD |
-               MAC_10000FD;
+               MAC_10000FD | MAC_25000FD;
 
        dpaa2_mac_set_supported_interfaces(mac);