Skip to content

Commit 623cd87

Browse files
krzkPaolo Abeni
authored andcommitted
net: cdns,macb: use correct xlnx prefix for Xilinx
Use correct vendor for Xilinx versions of Cadence MACB/GEM Ethernet controller. The Versal compatible was not released, so it can be changed. Zynq-7xxx and Ultrascale+ has to be kept in new and deprecated form. Signed-off-by: Krzysztof Kozlowski <[email protected]> Acked-by: Harini Katakam <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Paolo Abeni <[email protected]>
1 parent afa950b commit 623cd87

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

drivers/net/ethernet/cadence/macb_main.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4798,13 +4798,15 @@ static const struct of_device_id macb_dt_ids[] = {
47984798
{ .compatible = "atmel,sama5d4-gem", .data = &sama5d4_config },
47994799
{ .compatible = "cdns,at91rm9200-emac", .data = &emac_config },
48004800
{ .compatible = "cdns,emac", .data = &emac_config },
4801-
{ .compatible = "cdns,zynqmp-gem", .data = &zynqmp_config},
4802-
{ .compatible = "cdns,zynq-gem", .data = &zynq_config },
4801+
{ .compatible = "cdns,zynqmp-gem", .data = &zynqmp_config}, /* deprecated */
4802+
{ .compatible = "cdns,zynq-gem", .data = &zynq_config }, /* deprecated */
48034803
{ .compatible = "sifive,fu540-c000-gem", .data = &fu540_c000_config },
48044804
{ .compatible = "microchip,mpfs-macb", .data = &mpfs_config },
48054805
{ .compatible = "microchip,sama7g5-gem", .data = &sama7g5_gem_config },
48064806
{ .compatible = "microchip,sama7g5-emac", .data = &sama7g5_emac_config },
4807-
{ .compatible = "cdns,versal-gem", .data = &versal_config},
4807+
{ .compatible = "xlnx,zynqmp-gem", .data = &zynqmp_config},
4808+
{ .compatible = "xlnx,zynq-gem", .data = &zynq_config },
4809+
{ .compatible = "xlnx,versal-gem", .data = &versal_config},
48084810
{ /* sentinel */ }
48094811
};
48104812
MODULE_DEVICE_TABLE(of, macb_dt_ids);

0 commit comments

Comments
 (0)