| Message ID | 20220726070802.26579-2-krzysztof.kozlowski@linaro.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 623cd87006983935de6c2ad8e2d50e68f1b7d6e7 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [v2,1/2] dt-bindings: net: cdns,macb: use correct xlnx prefix for Xilinx | expand |
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 <pabeni@redhat.com> > Sent: Thursday, July 28, 2022 1:20 PM > To: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>; David S. Miller > <davem@davemloft.net>; Eric Dumazet <edumazet@google.com>; Jakub > Kicinski <kuba@kernel.org>; Rob Herring <robh+dt@kernel.org>; Krzysztof > Kozlowski <krzysztof.kozlowski+dt@linaro.org>; Nicolas Ferre > <nicolas.ferre@microchip.com>; Claudiu Beznea > <claudiu.beznea@microchip.com>; netdev@vger.kernel.org; > devicetree@vger.kernel.org; linux-kernel@vger.kernel.org > Cc: Harini Katakam <harini.katakam@xilinx.com>; Radhey Shyam Pandey > <radhey.shyam.pandey@xilinx.com> > 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 <harini.katakam@amd.com> Regards, Harini
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);
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> --- Changes since v1: 1. None Cc: Harini Katakam <harini.katakam@xilinx.com> Cc: Radhey Shyam Pandey <radhey.shyam.pandey@xilinx.com> --- drivers/net/ethernet/cadence/macb_main.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)