On 08/06/2018 12:16 AM, Zhao Qiang wrote:

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

Changes for v2

• add kernel version and commit id modifing the binding

drivers/net/fm/init.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/net/fm/init.c b/drivers/net/fm/init.c index 71c3abe..48344f0 100644 --- a/drivers/net/fm/init.c +++ b/drivers/net/fm/init.c @@ -329,7 +329,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-tgec") &&
  

• 	    ft_fixup_port(blob, &fm_info[i], "fsl,fman-xgec"))
  

Is this logic correct? You want success return from fixing up _both_ fman-tgec and fman-xgec before fixup fman-10-mac?

York