net: fman: Support both new and legacy FMan Compatibles

Recently the FMan Port and MAC compatibles were changed. This patch
aligns the FMan Port and MAC compatibles to the new FMan device tree
binding document. The FMan device tree binding document can be found
in the Linux kernel version 3.18.0, commit
297d35fd2a7d3fbd4e5c0f0c1c18213117ba11ba
./Documentation/devicetree/bindings/powerpc/fsl/fman.txt

This patch doesn't affect legacy compatibles support.

Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
[York S: reformatted commit message]
Reviewed-by: York Sun <york.sun@nxp.com>

diff --git a/drivers/net/fm/init.c b/drivers/net/fm/init.c
index 147d0437c5b5d20ce63cf9a372fdd6f1c3fb7463..f896e80b6d921ab471ed19fb85413953453bc796 100644 (file)
--- a/drivers/net/fm/init.c
+++ b/drivers/net/fm/init.c
@@ -328,7 +328,8 @@ void fdt_fixup_fman_ethernet(void *blob)
                                ft_fixup_port(blob, &fm_info[i],
                                              "fsl,fman-1g-mac");
                } else {
-                       if (ft_fixup_port(blob, &fm_info[i], "fsl,fman-tgec"))
+                       if (ft_fixup_port(blob, &fm_info[i], "fsl,fman-xgec") &&
+                           ft_fixup_port(blob, &fm_info[i], "fsl,fman-tgec"))
                                ft_fixup_port(blob, &fm_info[i],
                                              "fsl,fman-10g-mac");
                }