Message ID | 20220726070802.26579-1-krzysztof.kozlowski@linaro.org (mailing list archive) |
---|---|
State | Accepted |
Commit | afa950b8adc91c9bacf66c5987fa912bf971188f |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [v2,1/2] dt-bindings: net: cdns,macb: use correct xlnx prefix for Xilinx | expand |
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!
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>;