Merge git://git.denx.de/u-boot-spi

[oweals/u-boot.git] / drivers / net / fm / memac.c

diff --git a/drivers/net/fm/memac.c b/drivers/net/fm/memac.c
index 60e898cd7c34f0f4e29c09159be1bc292cf8e27b..ea50ed38f45fb8d615c5737e4afa9439113e233d 100644 (file)
--- a/drivers/net/fm/memac.c
+++ b/drivers/net/fm/memac.c
@@ -12,7 +12,7 @@
 #include <phy.h>
 #include <asm/types.h>
 #include <asm/io.h>
-#include <asm/fsl_memac.h>
+#include <fsl_memac.h>
 
 #include "fm.h"
 
@@ -84,12 +84,14 @@ static void memac_set_interface_mode(struct fsl_enet_mac *mac,
                if_mode |= IF_MODE_GMII;
                break;
        case PHY_INTERFACE_MODE_RGMII:
+       case PHY_INTERFACE_MODE_RGMII_TXID:
                if_mode |= (IF_MODE_GMII | IF_MODE_RG);
                break;
        case PHY_INTERFACE_MODE_RMII:
                if_mode |= (IF_MODE_GMII | IF_MODE_RM);
                break;
        case PHY_INTERFACE_MODE_SGMII:
+       case PHY_INTERFACE_MODE_SGMII_2500:
        case PHY_INTERFACE_MODE_QSGMII:
                if_mode &= ~IF_MODE_MASK;
                if_mode |= (IF_MODE_GMII);
@@ -105,7 +107,8 @@ static void memac_set_interface_mode(struct fsl_enet_mac *mac,
        if (type != PHY_INTERFACE_MODE_XGMII)
                if_mode |= IF_MODE_EN_AUTO;
 
-       if (type == PHY_INTERFACE_MODE_RGMII) {
+       if (type == PHY_INTERFACE_MODE_RGMII ||
+           type == PHY_INTERFACE_MODE_RGMII_TXID) {
                if_mode &= ~IF_MODE_EN_AUTO;
                if_mode &= ~IF_MODE_SETSP_MASK;
                switch (speed) {