From: Zhao Qiang Date: Wed, 29 Aug 2018 03:46:34 +0000 (+0800) Subject: net: fman: Support both new and legacy FMan Compatibles X-Git-Tag: v2018.11-rc1~29^2~2 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=db947fa038f753d17b6afa2dce06534e22b750b9;p=oweals%2Fu-boot.git 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 [York S: reformatted commit message] Reviewed-by: York Sun --- diff --git a/drivers/net/fm/init.c b/drivers/net/fm/init.c index 147d0437c5..f896e80b6d 100644 --- 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"); }