* [PATCH v5 linux-next 1/4] dt-bindings: net: rockchip-dwmac: fix rv1126 compatible warning
@ 2023-01-11 17:24 Anand Moon
2023-01-11 17:24 ` [PATCH v5 linux-next 3/4] ARM: dts: Add Ethernet GMAC node for RV1126 SoC Anand Moon
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Anand Moon @ 2023-01-11 17:24 UTC (permalink / raw)
To: David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Rob Herring, Krzysztof Kozlowski, Heiko Stuebner, David Wu,
Anand Moon, Jagan Teki
Cc: Johan Jonker, Rob Herring, Krzysztof Kozlowski, netdev,
devicetree, linux-arm-kernel, linux-rockchip, linux-kernel
Fix compatible string for RV1126 gmac, and constrain it to
be compatible with Synopsys dwmac 4.20a.
fix below warning
$ make CHECK_DTBS=y rv1126-edgeble-neu2-io.dtb
arch/arm/boot/dts/rv1126-edgeble-neu2-io.dtb: ethernet@ffc40000:
compatible: 'oneOf' conditional failed, one must be fixed:
['rockchip,rv1126-gmac', 'snps,dwmac-4.20a'] is too long
'rockchip,rv1126-gmac' is not one of ['rockchip,rk3568-gmac', 'rockchip,rk3588-gmac']
Fixes: b36fe2f43662 ("dt-bindings: net: rockchip-dwmac: add rv1126 compatible")
Reviewed-by: Jagan Teki <jagan@edgeble.ai>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Anand Moon <anand@edgeble.ai>
---
v5: none
v4: none
v3: added Ack and Rev from Rob and Jagan.
v2: drop SoB of Jagan Teki
added Fix tags and update the commit message of the warning.
---
Documentation/devicetree/bindings/net/rockchip-dwmac.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/net/rockchip-dwmac.yaml b/Documentation/devicetree/bindings/net/rockchip-dwmac.yaml
index 42fb72b6909d..04936632fcbb 100644
--- a/Documentation/devicetree/bindings/net/rockchip-dwmac.yaml
+++ b/Documentation/devicetree/bindings/net/rockchip-dwmac.yaml
@@ -49,11 +49,11 @@ properties:
- rockchip,rk3368-gmac
- rockchip,rk3399-gmac
- rockchip,rv1108-gmac
- - rockchip,rv1126-gmac
- items:
- enum:
- rockchip,rk3568-gmac
- rockchip,rk3588-gmac
+ - rockchip,rv1126-gmac
- const: snps,dwmac-4.20a
clocks:
--
2.39.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v5 linux-next 3/4] ARM: dts: Add Ethernet GMAC node for RV1126 SoC
2023-01-11 17:24 [PATCH v5 linux-next 1/4] dt-bindings: net: rockchip-dwmac: fix rv1126 compatible warning Anand Moon
@ 2023-01-11 17:24 ` Anand Moon
2023-01-13 5:47 ` [PATCH v5 linux-next 1/4] dt-bindings: net: rockchip-dwmac: fix rv1126 compatible warning Jakub Kicinski
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Anand Moon @ 2023-01-11 17:24 UTC (permalink / raw)
To: Heiko Stuebner, Rob Herring, Krzysztof Kozlowski, Richard Cochran
Cc: Johan Jonker, Anand Moon, Jagan Teki, linux-arm-kernel,
linux-rockchip, devicetree, linux-kernel, netdev
Rockchip RV1126 has GMAC 10/100/1000M ethernet controller
Co-Developed-by: Jagan Teki <jagan@edgeble.ai>
Signed-off-by: Anand Moon <anand@edgeble.ai>
Signed-off-by: Jagan Teki <jagan@edgeble.ai>
---
v5: Fix the $subject and add CoD of Jagan
v4: sort the node as reg adds. update the commit message.
v3: drop the gmac_clkin_m0 & gmac_clkin_m1 fix clock node which are not
used, Add SoB of Jagan Teki.
v2: drop SoB of Jagan Teki.
---
arch/arm/boot/dts/rv1126.dtsi | 49 +++++++++++++++++++++++++++++++++++
1 file changed, 49 insertions(+)
diff --git a/arch/arm/boot/dts/rv1126.dtsi b/arch/arm/boot/dts/rv1126.dtsi
index 1cb43147e90b..1f07d0a4fa73 100644
--- a/arch/arm/boot/dts/rv1126.dtsi
+++ b/arch/arm/boot/dts/rv1126.dtsi
@@ -332,6 +332,55 @@ timer0: timer@ff660000 {
clock-names = "pclk", "timer";
};
+ gmac: ethernet@ffc40000 {
+ compatible = "rockchip,rv1126-gmac", "snps,dwmac-4.20a";
+ reg = <0xffc40000 0x4000>;
+ interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "macirq", "eth_wake_irq";
+ rockchip,grf = <&grf>;
+ clocks = <&cru CLK_GMAC_SRC>, <&cru CLK_GMAC_TX_RX>,
+ <&cru CLK_GMAC_TX_RX>, <&cru CLK_GMAC_REF>,
+ <&cru ACLK_GMAC>, <&cru PCLK_GMAC>,
+ <&cru CLK_GMAC_TX_RX>, <&cru CLK_GMAC_PTPREF>;
+ clock-names = "stmmaceth", "mac_clk_rx",
+ "mac_clk_tx", "clk_mac_ref",
+ "aclk_mac", "pclk_mac",
+ "clk_mac_speed", "ptp_ref";
+ resets = <&cru SRST_GMAC_A>;
+ reset-names = "stmmaceth";
+
+ snps,mixed-burst;
+ snps,tso;
+
+ snps,axi-config = <&stmmac_axi_setup>;
+ snps,mtl-rx-config = <&mtl_rx_setup>;
+ snps,mtl-tx-config = <&mtl_tx_setup>;
+ status = "disabled";
+
+ mdio: mdio {
+ compatible = "snps,dwmac-mdio";
+ #address-cells = <0x1>;
+ #size-cells = <0x0>;
+ };
+
+ stmmac_axi_setup: stmmac-axi-config {
+ snps,wr_osr_lmt = <4>;
+ snps,rd_osr_lmt = <8>;
+ snps,blen = <0 0 0 0 16 8 4>;
+ };
+
+ mtl_rx_setup: rx-queues-config {
+ snps,rx-queues-to-use = <1>;
+ queue0 {};
+ };
+
+ mtl_tx_setup: tx-queues-config {
+ snps,tx-queues-to-use = <1>;
+ queue0 {};
+ };
+ };
+
emmc: mmc@ffc50000 {
compatible = "rockchip,rv1126-dw-mshc", "rockchip,rk3288-dw-mshc";
reg = <0xffc50000 0x4000>;
--
2.39.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v5 linux-next 1/4] dt-bindings: net: rockchip-dwmac: fix rv1126 compatible warning
2023-01-11 17:24 [PATCH v5 linux-next 1/4] dt-bindings: net: rockchip-dwmac: fix rv1126 compatible warning Anand Moon
2023-01-11 17:24 ` [PATCH v5 linux-next 3/4] ARM: dts: Add Ethernet GMAC node for RV1126 SoC Anand Moon
@ 2023-01-13 5:47 ` Jakub Kicinski
2023-01-13 8:39 ` Heiko Stübner
2023-01-14 4:20 ` patchwork-bot+netdevbpf
2023-01-15 14:46 ` (subset) " Heiko Stuebner
3 siblings, 1 reply; 6+ messages in thread
From: Jakub Kicinski @ 2023-01-13 5:47 UTC (permalink / raw)
To: Anand Moon
Cc: David S. Miller, Eric Dumazet, Paolo Abeni, Rob Herring,
Krzysztof Kozlowski, Heiko Stuebner, David Wu, Jagan Teki,
Johan Jonker, Rob Herring, Krzysztof Kozlowski, netdev,
devicetree, linux-arm-kernel, linux-rockchip, linux-kernel
On Wed, 11 Jan 2023 17:24:31 +0000 Anand Moon wrote:
> Fix compatible string for RV1126 gmac, and constrain it to
> be compatible with Synopsys dwmac 4.20a.
>
> fix below warning
> $ make CHECK_DTBS=y rv1126-edgeble-neu2-io.dtb
> arch/arm/boot/dts/rv1126-edgeble-neu2-io.dtb: ethernet@ffc40000:
> compatible: 'oneOf' conditional failed, one must be fixed:
> ['rockchip,rv1126-gmac', 'snps,dwmac-4.20a'] is too long
> 'rockchip,rv1126-gmac' is not one of ['rockchip,rk3568-gmac', 'rockchip,rk3588-gmac']
>
> Fixes: b36fe2f43662 ("dt-bindings: net: rockchip-dwmac: add rv1126 compatible")
> Reviewed-by: Jagan Teki <jagan@edgeble.ai>
> Acked-by: Rob Herring <robh@kernel.org>
> Signed-off-by: Anand Moon <anand@edgeble.ai>
I think this patch should go via net-next?
Please let us know when it's ready to be applied,
'cause we're not CCed on the entire series..
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v5 linux-next 1/4] dt-bindings: net: rockchip-dwmac: fix rv1126 compatible warning
2023-01-13 5:47 ` [PATCH v5 linux-next 1/4] dt-bindings: net: rockchip-dwmac: fix rv1126 compatible warning Jakub Kicinski
@ 2023-01-13 8:39 ` Heiko Stübner
0 siblings, 0 replies; 6+ messages in thread
From: Heiko Stübner @ 2023-01-13 8:39 UTC (permalink / raw)
To: Anand Moon, Jakub Kicinski
Cc: David S. Miller, Eric Dumazet, Paolo Abeni, Rob Herring,
Krzysztof Kozlowski, David Wu, Jagan Teki, Johan Jonker,
Rob Herring, Krzysztof Kozlowski, netdev, devicetree,
linux-arm-kernel, linux-rockchip, linux-kernel
Hi Jakub,
Am Freitag, 13. Januar 2023, 06:47:12 CET schrieb Jakub Kicinski:
> On Wed, 11 Jan 2023 17:24:31 +0000 Anand Moon wrote:
> > Fix compatible string for RV1126 gmac, and constrain it to
> > be compatible with Synopsys dwmac 4.20a.
> >
> > fix below warning
> > $ make CHECK_DTBS=y rv1126-edgeble-neu2-io.dtb
> > arch/arm/boot/dts/rv1126-edgeble-neu2-io.dtb: ethernet@ffc40000:
> > compatible: 'oneOf' conditional failed, one must be fixed:
> > ['rockchip,rv1126-gmac', 'snps,dwmac-4.20a'] is too long
> > 'rockchip,rv1126-gmac' is not one of ['rockchip,rk3568-gmac', 'rockchip,rk3588-gmac']
> >
> > Fixes: b36fe2f43662 ("dt-bindings: net: rockchip-dwmac: add rv1126 compatible")
> > Reviewed-by: Jagan Teki <jagan@edgeble.ai>
> > Acked-by: Rob Herring <robh@kernel.org>
> > Signed-off-by: Anand Moon <anand@edgeble.ai>
>
> I think this patch should go via net-next?
> Please let us know when it's ready to be applied,
> 'cause we're not CCed on the entire series..
Correct, this patch should go via net-next, while I would pick up the
dts patches (2-4).
And this patch is ready to be applied.
Thanks
Heiko
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v5 linux-next 1/4] dt-bindings: net: rockchip-dwmac: fix rv1126 compatible warning
2023-01-11 17:24 [PATCH v5 linux-next 1/4] dt-bindings: net: rockchip-dwmac: fix rv1126 compatible warning Anand Moon
2023-01-11 17:24 ` [PATCH v5 linux-next 3/4] ARM: dts: Add Ethernet GMAC node for RV1126 SoC Anand Moon
2023-01-13 5:47 ` [PATCH v5 linux-next 1/4] dt-bindings: net: rockchip-dwmac: fix rv1126 compatible warning Jakub Kicinski
@ 2023-01-14 4:20 ` patchwork-bot+netdevbpf
2023-01-15 14:46 ` (subset) " Heiko Stuebner
3 siblings, 0 replies; 6+ messages in thread
From: patchwork-bot+netdevbpf @ 2023-01-14 4:20 UTC (permalink / raw)
To: Anand Moon
Cc: davem, edumazet, kuba, pabeni, robh+dt, krzysztof.kozlowski+dt,
heiko, david.wu, jagan, jbx6244, robh, krzysztof.kozlowski,
netdev, devicetree, linux-arm-kernel, linux-rockchip,
linux-kernel
Hello:
This series was applied to netdev/net-next.git (master)
by Jakub Kicinski <kuba@kernel.org>:
On Wed, 11 Jan 2023 17:24:31 +0000 you wrote:
> Fix compatible string for RV1126 gmac, and constrain it to
> be compatible with Synopsys dwmac 4.20a.
>
> fix below warning
> $ make CHECK_DTBS=y rv1126-edgeble-neu2-io.dtb
> arch/arm/boot/dts/rv1126-edgeble-neu2-io.dtb: ethernet@ffc40000:
> compatible: 'oneOf' conditional failed, one must be fixed:
> ['rockchip,rv1126-gmac', 'snps,dwmac-4.20a'] is too long
> 'rockchip,rv1126-gmac' is not one of ['rockchip,rk3568-gmac', 'rockchip,rk3588-gmac']
>
> [...]
Here is the summary with links:
- [v5,linux-next,1/4] dt-bindings: net: rockchip-dwmac: fix rv1126 compatible warning
https://git.kernel.org/netdev/net-next/c/e471d83e1fa0
- [v5,linux-next,3/4] ARM: dts: Add Ethernet GMAC node for RV1126 SoC
(no matching commit)
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] 6+ messages in thread
* Re: (subset) [PATCH v5 linux-next 1/4] dt-bindings: net: rockchip-dwmac: fix rv1126 compatible warning
2023-01-11 17:24 [PATCH v5 linux-next 1/4] dt-bindings: net: rockchip-dwmac: fix rv1126 compatible warning Anand Moon
` (2 preceding siblings ...)
2023-01-14 4:20 ` patchwork-bot+netdevbpf
@ 2023-01-15 14:46 ` Heiko Stuebner
3 siblings, 0 replies; 6+ messages in thread
From: Heiko Stuebner @ 2023-01-15 14:46 UTC (permalink / raw)
To: Jakub Kicinski, David Wu, Paolo Abeni, Eric Dumazet,
Krzysztof Kozlowski, Rob Herring, Anand Moon, Jagan Teki,
David S. Miller
Cc: Heiko Stuebner, Johan Jonker, linux-rockchip, linux-arm-kernel,
Rob Herring, devicetree, Krzysztof Kozlowski, linux-kernel,
netdev
On Wed, 11 Jan 2023 17:24:31 +0000, Anand Moon wrote:
> Fix compatible string for RV1126 gmac, and constrain it to
> be compatible with Synopsys dwmac 4.20a.
>
> fix below warning
> $ make CHECK_DTBS=y rv1126-edgeble-neu2-io.dtb
> arch/arm/boot/dts/rv1126-edgeble-neu2-io.dtb: ethernet@ffc40000:
> compatible: 'oneOf' conditional failed, one must be fixed:
> ['rockchip,rv1126-gmac', 'snps,dwmac-4.20a'] is too long
> 'rockchip,rv1126-gmac' is not one of ['rockchip,rk3568-gmac', 'rockchip,rk3588-gmac']
>
> [...]
Applied, thanks!
[2/4] ARM: dts: rockchip: rv1126: Add ethernet rgmiim1 pin-control
commit: bdcb1f4e19cbbe9ee8197078d25a2d4c27216ab1
[3/4] ARM: dts: Add Ethernet GMAC node for RV1126 SoC
commit: 594a76a4465a96bc11f8ecf4504907afb064ce41
[4/4] ARM: dts: rockchip: rv1126: Enable Ethernet for Neu2-IO
commit: aa3555c5fd3d2f5114ae7d28f7897072b5e6e60a
Best regards,
--
Heiko Stuebner <heiko@sntech.de>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-01-15 14:47 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-11 17:24 [PATCH v5 linux-next 1/4] dt-bindings: net: rockchip-dwmac: fix rv1126 compatible warning Anand Moon
2023-01-11 17:24 ` [PATCH v5 linux-next 3/4] ARM: dts: Add Ethernet GMAC node for RV1126 SoC Anand Moon
2023-01-13 5:47 ` [PATCH v5 linux-next 1/4] dt-bindings: net: rockchip-dwmac: fix rv1126 compatible warning Jakub Kicinski
2023-01-13 8:39 ` Heiko Stübner
2023-01-14 4:20 ` patchwork-bot+netdevbpf
2023-01-15 14:46 ` (subset) " Heiko Stuebner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).