| Message ID | 20180801094818.35353-1-qiang.zhao@nxp.com |
|---|---|
| State | Changes Requested |
| Delegated to: | York Sun |
| Headers | show |
| Series | [U-Boot] net: fman: Support both new and legacy FMan Compatibles | expand |
On 08/01/2018 02:50 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: > ./Documentation/devicetree/bindings/net/fsl-fman.txt It would be helpful to know which version or commit has this change. It doesn't impact this patch though. Reviewed-by: York Sun <york.sun@nxp.com>
On Wed, Aug 1, 2018 at 4:48 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: > ./Documentation/devicetree/bindings/net/fsl-fman.txt Please reference the Linux commit that made the change and the version of the kernel that made the change. > > This patch doesn't affect legacy compatibles support. > > Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
On 08/02/2018 23:26 PM, York Sun wrote: > On 08/01/2018 02:50 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: >> ./Documentation/devicetree/bindings/net/fsl-fman.txt > It would be helpful to know which version or commit has this change. > It doesn't impact this patch though. Thank you for your suggestion! I will add it in next version. BR Qiang Zhao
diff --git a/drivers/net/fm/init.c b/drivers/net/fm/init.c index 147d043..e3b1a50 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-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: ./Documentation/devicetree/bindings/net/fsl-fman.txt This patch doesn't affect legacy compatibles support. Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com> --- drivers/net/fm/init.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)