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]>
---
Changes since v1:
1. None
Cc: Harini Katakam <[email protected]>
Cc: Radhey Shyam Pandey <[email protected]>
---
drivers/net/ethernet/cadence/macb_main.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index 4cd4f57ca2aa..494fe961a49d 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -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);
--
2.34.1
Hello,
On Tue, 2022-07-26 at 09:08 +0200, Krzysztof Kozlowski wrote:
> Use correct vendor for Xilinx versions of Cadence MACB/GEM Ethernet
> controller. The Versal compatible was not released, so it can be
> changed.
I'm keeping this in PW a little extra time to allow for xilinx's
review.
@Harini, @Radhey: could you please confirm the above?
Thanks!
Paolo
On 28/07/2022 09:49, Paolo Abeni wrote:
> Hello,
>
> On Tue, 2022-07-26 at 09:08 +0200, Krzysztof Kozlowski wrote:
>> Use correct vendor for Xilinx versions of Cadence MACB/GEM Ethernet
>> controller. The Versal compatible was not released, so it can be
>> changed.
>
> I'm keeping this in PW a little extra time to allow for xilinx's
> review.
>
> @Harini, @Radhey: could you please confirm the above?
The best would be if it still get merged for v5.20 to replace the
cdns,versal-gem with xlnx (as it is not released yet), so we are a bit
tight here on timing. Anyway, thanks Paolo for looking at it!
Best regards,
Krzysztof
On Thu, 2022-07-28 at 10:45 +0200, Krzysztof Kozlowski wrote:
> On 28/07/2022 09:49, Paolo Abeni wrote:
> > Hello,
> >
> > On Tue, 2022-07-26 at 09:08 +0200, Krzysztof Kozlowski wrote:
> > > Use correct vendor for Xilinx versions of Cadence MACB/GEM Ethernet
> > > controller. The Versal compatible was not released, so it can be
> > > changed.
> >
> > I'm keeping this in PW a little extra time to allow for xilinx's
> > review.
> >
> > @Harini, @Radhey: could you please confirm the above?
>
> The best would be if it still get merged for v5.20 to replace the
> cdns,versal-gem with xlnx (as it is not released yet),
Makes sense. Also I misread the commit message in a very dumb way.
> so we are a bit
> tight here on timing.
It should make it.
Cheers,
Paolo
Hi Krzysztof, Paolo,
> -----Original Message-----
> From: Paolo Abeni <[email protected]>
> Sent: Thursday, July 28, 2022 1:20 PM
> To: Krzysztof Kozlowski <[email protected]>; David S. Miller
> <[email protected]>; Eric Dumazet <[email protected]>; Jakub
> Kicinski <[email protected]>; Rob Herring <[email protected]>; Krzysztof
> Kozlowski <[email protected]>; Nicolas Ferre
> <[email protected]>; Claudiu Beznea
> <[email protected]>; [email protected];
> [email protected]; [email protected]
> Cc: Harini Katakam <[email protected]>; Radhey Shyam Pandey
> <[email protected]>
> Subject: Re: [PATCH v2 2/2] net: cdns,macb: use correct xlnx prefix for Xilinx
>
> CAUTION: This message has originated from an External Source. Please use
> proper judgment and caution when opening attachments, clicking links, or
> responding to this email.
>
>
> Hello,
>
> On Tue, 2022-07-26 at 09:08 +0200, Krzysztof Kozlowski wrote:
> > Use correct vendor for Xilinx versions of Cadence MACB/GEM Ethernet
> > controller. The Versal compatible was not released, so it can be
> > changed.
>
> I'm keeping this in PW a little extra time to allow for xilinx's review.
>
> @Harini, @Radhey: could you please confirm the above?
Thanks, this works for us. For both patches:
Acked-by: Harini Katakam <[email protected]>
Regards,
Harini