* [PATCH v2 1/2] dt-bindings: net: cdns,macb: use correct xlnx prefix for Xilinx @ 2022-07-26 7:08 Krzysztof Kozlowski 2022-07-26 7:08 ` [PATCH v2 2/2] " Krzysztof Kozlowski 2022-07-28 11:20 ` [PATCH v2 1/2] dt-bindings: " patchwork-bot+netdevbpf 0 siblings, 2 replies; 7+ messages in thread From: Krzysztof Kozlowski @ 2022-07-26 7:08 UTC (permalink / raw) To: David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Rob Herring, Krzysztof Kozlowski, Nicolas Ferre, Claudiu Beznea, netdev, devicetree, linux-kernel Cc: Krzysztof Kozlowski, Rob Herring, Harini Katakam, Radhey Shyam Pandey 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 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v2 2/2] net: cdns,macb: use correct xlnx prefix for Xilinx 2022-07-26 7:08 [PATCH v2 1/2] dt-bindings: net: cdns,macb: use correct xlnx prefix for Xilinx Krzysztof Kozlowski @ 2022-07-26 7:08 ` Krzysztof Kozlowski 2022-07-28 7:49 ` Paolo Abeni 2022-07-28 11:20 ` [PATCH v2 1/2] dt-bindings: " patchwork-bot+netdevbpf 1 sibling, 1 reply; 7+ messages in thread From: Krzysztof Kozlowski @ 2022-07-26 7:08 UTC (permalink / raw) To: David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Rob Herring, Krzysztof Kozlowski, Nicolas Ferre, Claudiu Beznea, netdev, devicetree, linux-kernel Cc: Krzysztof Kozlowski, Harini Katakam, Radhey Shyam Pandey 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 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v2 2/2] net: cdns,macb: use correct xlnx prefix for Xilinx 2022-07-26 7:08 ` [PATCH v2 2/2] " Krzysztof Kozlowski @ 2022-07-28 7:49 ` Paolo Abeni 2022-07-28 8:45 ` Krzysztof Kozlowski 2022-07-28 11:05 ` Katakam, Harini 0 siblings, 2 replies; 7+ messages in thread From: Paolo Abeni @ 2022-07-28 7:49 UTC (permalink / raw) To: Krzysztof Kozlowski, David S. Miller, Eric Dumazet, Jakub Kicinski, Rob Herring, Krzysztof Kozlowski, Nicolas Ferre, Claudiu Beznea, netdev, devicetree, linux-kernel Cc: Harini Katakam, Radhey Shyam Pandey 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 ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 2/2] net: cdns,macb: use correct xlnx prefix for Xilinx 2022-07-28 7:49 ` Paolo Abeni @ 2022-07-28 8:45 ` Krzysztof Kozlowski 2022-07-28 10:29 ` Paolo Abeni 2022-07-28 11:05 ` Katakam, Harini 1 sibling, 1 reply; 7+ messages in thread From: Krzysztof Kozlowski @ 2022-07-28 8:45 UTC (permalink / raw) To: Paolo Abeni, David S. Miller, Eric Dumazet, Jakub Kicinski, Rob Herring, Krzysztof Kozlowski, Nicolas Ferre, Claudiu Beznea, netdev, devicetree, linux-kernel Cc: Harini Katakam, Radhey Shyam Pandey 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 ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 2/2] net: cdns,macb: use correct xlnx prefix for Xilinx 2022-07-28 8:45 ` Krzysztof Kozlowski @ 2022-07-28 10:29 ` Paolo Abeni 0 siblings, 0 replies; 7+ messages in thread From: Paolo Abeni @ 2022-07-28 10:29 UTC (permalink / raw) To: Krzysztof Kozlowski, David S. Miller, Eric Dumazet, Jakub Kicinski, Rob Herring, Krzysztof Kozlowski, Nicolas Ferre, Claudiu Beznea, netdev, devicetree, linux-kernel Cc: Harini Katakam, Radhey Shyam Pandey 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 ^ permalink raw reply [flat|nested] 7+ messages in thread
* RE: [PATCH v2 2/2] net: cdns,macb: use correct xlnx prefix for Xilinx 2022-07-28 7:49 ` Paolo Abeni 2022-07-28 8:45 ` Krzysztof Kozlowski @ 2022-07-28 11:05 ` Katakam, Harini 1 sibling, 0 replies; 7+ messages in thread From: Katakam, Harini @ 2022-07-28 11:05 UTC (permalink / raw) To: Paolo Abeni, Krzysztof Kozlowski, David S. Miller, Eric Dumazet, Jakub Kicinski, Rob Herring, Krzysztof Kozlowski, Nicolas Ferre, Claudiu Beznea, netdev, devicetree, linux-kernel Cc: Harini Katakam, Radhey Shyam Pandey 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 ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 1/2] dt-bindings: net: cdns,macb: use correct xlnx prefix for Xilinx 2022-07-26 7:08 [PATCH v2 1/2] dt-bindings: net: cdns,macb: use correct xlnx prefix for Xilinx Krzysztof Kozlowski 2022-07-26 7:08 ` [PATCH v2 2/2] " Krzysztof Kozlowski @ 2022-07-28 11:20 ` patchwork-bot+netdevbpf 1 sibling, 0 replies; 7+ messages in thread From: patchwork-bot+netdevbpf @ 2022-07-28 11:20 UTC (permalink / raw) To: Krzysztof Kozlowski Cc: davem, edumazet, kuba, pabeni, robh+dt, krzysztof.kozlowski+dt, nicolas.ferre, claudiu.beznea, netdev, devicetree, linux-kernel, robh, harini.katakam, radhey.shyam.pandey 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 ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-07-28 11:23 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2022-07-26 7:08 [PATCH v2 1/2] dt-bindings: net: cdns,macb: use correct xlnx prefix for Xilinx Krzysztof Kozlowski 2022-07-26 7:08 ` [PATCH v2 2/2] " Krzysztof Kozlowski 2022-07-28 7:49 ` Paolo Abeni 2022-07-28 8:45 ` Krzysztof Kozlowski 2022-07-28 10:29 ` Paolo Abeni 2022-07-28 11:05 ` Katakam, Harini 2022-07-28 11:20 ` [PATCH v2 1/2] dt-bindings: " patchwork-bot+netdevbpf
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.