Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <krzysztof.kozlowski@linaro.org>
Acked-by: Harini Katakam <harini.katakam@amd.com>
Link: https://lore.kernel.org/r/20220726070802.26579-2-krzysztof.kozlowski@linaro.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

authored by

Krzysztof Kozlowski and committed by
Paolo Abeni
623cd870 afa950b8

+5 -3
+5 -3
drivers/net/ethernet/cadence/macb_main.c
··· 4798 4798 { .compatible = "atmel,sama5d4-gem", .data = &sama5d4_config }, 4799 4799 { .compatible = "cdns,at91rm9200-emac", .data = &emac_config }, 4800 4800 { .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 */ 4803 4803 { .compatible = "sifive,fu540-c000-gem", .data = &fu540_c000_config }, 4804 4804 { .compatible = "microchip,mpfs-macb", .data = &mpfs_config }, 4805 4805 { .compatible = "microchip,sama7g5-gem", .data = &sama7g5_gem_config }, 4806 4806 { .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}, 4808 4810 { /* sentinel */ } 4809 4811 }; 4810 4812 MODULE_DEVICE_TABLE(of, macb_dt_ids);