2022-07-25 20:06:11

by Krzysztof Kozlowski

[permalink] [raw]
Subject: [PATCH 1/2] dt-bindings: 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 <[email protected]>

---

Cc: Harini Katakam <[email protected]>
Cc: Radhey Shyam Pandey <[email protected]>
---
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..77d3b73718e4 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
+ description: deprecated
+
+ - 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


2022-07-26 02:38:54

by Rob Herring

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

On Mon, Jul 25, 2022 at 1:51 PM Krzysztof Kozlowski
<[email protected]> 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 <[email protected]>
>
> ---
>
> Cc: Harini Katakam <[email protected]>
> Cc: Radhey Shyam Pandey <[email protected]>
> ---
> 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..77d3b73718e4 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
> + description: deprecated

You meant 'deprecated: true', right? With that,

Reviewed-by: Rob Herring <[email protected]>

Thanks for the quick fix.

Rob

2022-07-26 07:21:59

by Krzysztof Kozlowski

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

On 26/07/2022 04:27, Rob Herring wrote:
>> - 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
>> + description: deprecated
>
> You meant 'deprecated: true', right? With that,

Yes, I'll send a v2.

>
> Reviewed-by: Rob Herring <[email protected]>
>


Best regards,
Krzysztof