diff mbox series

[v5,linux-next,1/4] dt-bindings: net: rockchip-dwmac: fix rv1126 compatible warning

Message ID 20230111172437.5295-1-anand@edgeble.ai (mailing list archive)
State New, archived
Headers show
Series [v5,linux-next,1/4] dt-bindings: net: rockchip-dwmac: fix rv1126 compatible warning | expand

Commit Message

Anand Moon Jan. 11, 2023, 5:24 p.m. UTC
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(-)

Comments

Jakub Kicinski Jan. 13, 2023, 5:47 a.m. UTC | #1
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..
Heiko Stuebner Jan. 13, 2023, 8:39 a.m. UTC | #2
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
patchwork-bot+netdevbpf@kernel.org Jan. 14, 2023, 4:20 a.m. UTC | #3
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!
Heiko Stuebner Jan. 15, 2023, 2:46 p.m. UTC | #4
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,
diff mbox series

Patch

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: