[PATCH v2 1/2] dt-bindings: net: cdns,macb: use correct xlnx prefix for Xilinx

[PATCH v2 1/2] dt-bindings: net: cdns,macb: use correct xlnx prefix for Xilinx

[Krzysztof Kozlowski]

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>
Reviewed-by: Rob Herring <robh@kernel.org>

---

Changes since v1:
1. Correct deprecated:true.
2. Add Rb tag.

Cc: Harini Katakam <harini.katakam@xilinx.com>
Cc: Radhey Shyam Pandey <radhey.shyam.pandey@xilinx.com>
---
 Documentation/devicetree/bindings/net/cdns,macb.yaml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/net/cdns,macb.yaml b/Documentation/devicetree/bindings/net/cdns,macb.yaml
index 762deccd3640..dfb2860ca771 100644
--- a/Documentation/devicetree/bindings/net/cdns,macb.yaml
+++ b/Documentation/devicetree/bindings/net/cdns,macb.yaml
@@ -20,10 +20,17 @@ properties:
 
       - items:
           - enum:
-              - cdns,versal-gem       # Xilinx Versal
               - cdns,zynq-gem         # Xilinx Zynq-7xxx SoC
               - cdns,zynqmp-gem       # Xilinx Zynq Ultrascale+ MPSoC
           - const: cdns,gem           # Generic
+        deprecated: true
+
+      - items:
+          - enum:
+              - xlnx,versal-gem       # Xilinx Versal
+              - xlnx,zynq-gem         # Xilinx Zynq-7xxx SoC
+              - xlnx,zynqmp-gem       # Xilinx Zynq Ultrascale+ MPSoC
+          - const: cdns,gem           # Generic
 
       - items:
           - enum:
@@ -183,7 +190,7 @@ examples:
             #address-cells = <2>;
             #size-cells = <2>;
             gem1: ethernet@ff0c0000 {
-                    compatible = "cdns,zynqmp-gem", "cdns,gem";
+                    compatible = "xlnx,zynqmp-gem", "cdns,gem";
                     interrupt-parent = <&gic>;
                     interrupts = <0 59 4>, <0 59 4>;
                     reg = <0x0 0xff0c0000 0x0 0x1000>;
-- 
2.34.1

[PATCH v2 2/2] net: cdns,macb: use correct xlnx prefix for Xilinx

[Krzysztof Kozlowski]

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(-)

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

Re: [PATCH v2 2/2] net: cdns,macb: use correct xlnx prefix for Xilinx

[Paolo Abeni]

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

Re: [PATCH v2 2/2] net: cdns,macb: use correct xlnx prefix for Xilinx

[Krzysztof Kozlowski]

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

Re: [PATCH v2 2/2] net: cdns,macb: use correct xlnx prefix for Xilinx

[Paolo Abeni]

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

RE: [PATCH v2 2/2] net: cdns,macb: use correct xlnx prefix for Xilinx

[Katakam, Harini]

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

Re: [PATCH v2 1/2] dt-bindings: net: cdns,macb: use correct xlnx prefix for Xilinx

[patchwork-bot+netdevbpf]

Hello:

This series was applied to netdev/net-next.git (master)
by Paolo Abeni <pabeni@redhat.com>:

On Tue, 26 Jul 2022 09:08:01 +0200 you wrote:
> 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>
> Reviewed-by: Rob Herring <robh@kernel.org>
> 
> [...]

Here is the summary with links:
  - [v2,1/2] dt-bindings: net: cdns,macb: use correct xlnx prefix for Xilinx
    https://git.kernel.org/netdev/net-next/c/afa950b8adc9
  - [v2,2/2] net: cdns,macb: use correct xlnx prefix for Xilinx
    https://git.kernel.org/netdev/net-next/c/623cd8700698

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html