[U-Boot,v3] 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>
---
Changes for v2
	- add kernel version and commit id modifing the binding
Changes for v3
	- put "fsl,fman-xgec" before "fsl,fman-tgec"
	- because it use the former in latest kernel version

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

Hi York,

It seems nobody have comments on this patch,
Could you help to take action on it?

Best Regards
Qiang Zhao

> -----Original Message-----
> From: Zhao Qiang <qiang.zhao@nxp.com>
> Sent: 2018年8月29日 11:47
> To: York Sun <york.sun@nxp.com>; joe.hershberger@ni.com
> Cc: u-boot@lists.denx.de; Qiang Zhao <qiang.zhao@nxp.com>
> Subject: [v3 patch] 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>
> ---
> Changes for v2
> 	- add kernel version and commit id modifing the binding Changes for v3
> 	- put "fsl,fman-xgec" before "fsl,fman-tgec"
> 	- because it use the former in latest kernel version
> 
>  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 147d043..f896e80
> 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");
>  		}
> --
> 1.7.1

On 09/20/2018 07:57 PM, Qiang Zhao wrote:
> Hi York,
> 
> It seems nobody have comments on this patch,
> Could you help to take action on it?
> 

I will try when I get a chance. Thanks.

York

On 08/28/2018 08:49 PM, 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
> Changes for v3
> 	- put "fsl,fman-xgec" before "fsl,fman-tgec"
> 	- because it use the former in latest kernel version
> 

Applied to fsl-qoriq master, awaiting upstream. Thanks.

York