Commit 623cd870 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Paolo Abeni
Browse files

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: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Acked-by: default avatarHarini Katakam <harini.katakam@amd.com>
Link: https://lore.kernel.org/r/20220726070802.26579-2-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent afa950b8

drivers/net/ethernet/cadence/macb_main.c

+5 −3
Original line number Diff line number Diff line
@@ -4798,13 +4798,15 @@ static const struct of_device_id macb_dt_ids[] = { 
	{ .compatible = "atmel,sama5d4-gem", .data = &sama5d4_config },

	{ .compatible = "cdns,at91rm9200-emac", .data = &emac_config },

	{ .compatible = "cdns,emac", .data = &emac_config },

	{ .compatible = "cdns,zynqmp-gem", .data = &zynqmp_config},

	{ .compatible = "cdns,zynq-gem", .data = &zynq_config },

	{ .compatible = "cdns,zynqmp-gem", .data = &zynqmp_config}, /* deprecated */

	{ .compatible = "cdns,zynq-gem", .data = &zynq_config }, /* deprecated */

	{ .compatible = "sifive,fu540-c000-gem", .data = &fu540_c000_config },

	{ .compatible = "microchip,mpfs-macb", .data = &mpfs_config },

	{ .compatible = "microchip,sama7g5-gem", .data = &sama7g5_gem_config },

	{ .compatible = "microchip,sama7g5-emac", .data = &sama7g5_emac_config },

	{ .compatible = "cdns,versal-gem", .data = &versal_config},

	{ .compatible = "xlnx,zynqmp-gem", .data = &zynqmp_config},

	{ .compatible = "xlnx,zynq-gem", .data = &zynq_config },

	{ .compatible = "xlnx,versal-gem", .data = &versal_config},

	{ /* sentinel */ }

};

MODULE_DEVICE_TABLE(of, macb_dt_ids);