| Message ID | 20180806071416.6159-1-qiang.zhao@nxp.com |
|---|---|
| State | Superseded |
| Delegated to: | York Sun |
| Headers | show |
| Series | [U-Boot,v2] net: fman: Support both new and legacy FMan Compatibles | expand |
On Mon, Aug 6, 2018 at 2:14 AM, Zhao Qiang <qiang.zhao@nxp.com> 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> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
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
On 08/23/2018 23:20 PM, York Sun wrote: >> - 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? fman-10-mac, tgec and xgec is the different version compatible, it used fman-10-mac at the first time, then modified to tgec and now xgec. If it fix up successfully with fman-10-mac, it will return 0, and doesn't fix up for the other two compatible. If failed with fman-tgec, then to fix up for fsl,fman-xgec, if success, return 0 and doesn't fix up for fman-10-mac. BR Qiang Zhao
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")) ft_fixup_port(blob, &fm_info[i], "fsl,fman-10g-mac"); }
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(-)