update to 2015.04-rc1

[karo-tx-uboot.git] / drivers / net / fm / init.c

diff --git a/drivers/net/fm/init.c b/drivers/net/fm/init.c
index 6cf21c6f652f84c08a3f7d59774e7e52b4ca0e4d..9a8a007861435872ca883e087c03284574425b7f 100644 (file)
--- a/drivers/net/fm/init.c
+++ b/drivers/net/fm/init.c
@@ -247,10 +247,12 @@ static void ft_fixup_port(void *blob, struct fm_eth_info *info, char *prop)
        }
 
 #ifdef CONFIG_SYS_FMAN_V3
+#ifndef CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
        /*
-        * Physically FM1_DTSEC9 and FM1_10GEC1 use the same dual-role MAC, when
-        * FM1_10GEC1 is enabled and  FM1_DTSEC9 is disabled, ensure that the
-        * dual-role MAC is not disabled, ditto for other dual-role MACs.
+        * On T2/T4 SoCs, physically FM1_DTSEC9 and FM1_10GEC1 use the same
+        * dual-role MAC, when FM1_10GEC1 is enabled and  FM1_DTSEC9
+        * is disabled, ensure that the dual-role MAC is not disabled,
+        * ditto for other dual-role MACs.
         */
        if (((info->port == FM1_DTSEC9) && (PORT_IS_ENABLED(FM1_10GEC1)))  ||
            ((info->port == FM1_DTSEC10) && (PORT_IS_ENABLED(FM1_10GEC2))) ||
@@ -266,6 +268,17 @@ static void ft_fixup_port(void *blob, struct fm_eth_info *info, char *prop)
            ((info->port == FM2_DTSEC10) && (PORT_IS_ENABLED(FM2_10GEC2)))      ||
            ((info->port == FM2_10GEC1) && (PORT_IS_ENABLED(FM2_DTSEC9)))       ||
            ((info->port == FM2_10GEC2) && (PORT_IS_ENABLED(FM2_DTSEC10)))
+#endif
+#else
+       /* FM1_DTSECx and FM1_10GECx use the same dual-role MAC */
+       if (((info->port == FM1_DTSEC1) && (PORT_IS_ENABLED(FM1_10GEC1)))  ||
+           ((info->port == FM1_DTSEC2) && (PORT_IS_ENABLED(FM1_10GEC2)))  ||
+           ((info->port == FM1_DTSEC3) && (PORT_IS_ENABLED(FM1_10GEC3)))  ||
+           ((info->port == FM1_DTSEC4) && (PORT_IS_ENABLED(FM1_10GEC4)))  ||
+           ((info->port == FM1_10GEC1) && (PORT_IS_ENABLED(FM1_DTSEC1)))  ||
+           ((info->port == FM1_10GEC2) && (PORT_IS_ENABLED(FM1_DTSEC2)))  ||
+           ((info->port == FM1_10GEC3) && (PORT_IS_ENABLED(FM1_DTSEC3)))  ||
+           ((info->port == FM1_10GEC4) && (PORT_IS_ENABLED(FM1_DTSEC4)))
 #endif
        )
                return;