[PATCH v3 1/1] dt-bindings: net: fsl,qoriq-mc-dpmac: using unevaluatedProperties

[PATCH v3 1/1] dt-bindings: net: fsl,qoriq-mc-dpmac: using unevaluatedProperties

[Frank Li]

Replace additionalProperties with unevaluatedProperties because it have
allOf: $ref: ethernet-controller.yaml#.

Remove all properties, which already defined in ethernet-controller.yaml.

Fixed below CHECK_DTBS warnings:
arch/arm64/boot/dts/freescale/fsl-lx2160a-bluebox3.dtb:
   fsl-mc@80c000000: dpmacs:ethernet@11: 'fixed-link' does not match any of the regexes: 'pinctrl-[0-9]+'
        from schema $id: http://devicetree.org/schemas/misc/fsl,qoriq-mc.yaml#

Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
Change from v2 to v3
- keep pcs-handle because need maxItems

Change from v1 to v2
- Remove properties, which already defined in ethernet-controller.yaml
---
 .../devicetree/bindings/net/fsl,qoriq-mc-dpmac.yaml    | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/Documentation/devicetree/bindings/net/fsl,qoriq-mc-dpmac.yaml b/Documentation/devicetree/bindings/net/fsl,qoriq-mc-dpmac.yaml
index a1b71b35319e7..f19c4fa66f18b 100644
--- a/Documentation/devicetree/bindings/net/fsl,qoriq-mc-dpmac.yaml
+++ b/Documentation/devicetree/bindings/net/fsl,qoriq-mc-dpmac.yaml
@@ -24,24 +24,16 @@ properties:
     maxItems: 1
     description: The DPMAC number
 
-  phy-handle: true
-
-  phy-connection-type: true
-
-  phy-mode: true
-
   pcs-handle:
     maxItems: 1
     description:
       A reference to a node representing a PCS PHY device found on
       the internal MDIO bus.
 
-  managed: true
-
 required:
   - reg
 
-additionalProperties: false
+unevaluatedProperties: false
 
 examples:
   - |
-- 
2.34.1

Re: [PATCH v3 1/1] dt-bindings: net: fsl,qoriq-mc-dpmac: using unevaluatedProperties

[Krzysztof Kozlowski]

On 11/08/2024 20:40, Frank Li wrote:
> Replace additionalProperties with unevaluatedProperties because it have
> allOf: $ref: ethernet-controller.yaml#.
> 
> Remove all properties, which already defined in ethernet-controller.yaml.
> 
> Fixed below CHECK_DTBS warnings:
> arch/arm64/boot/dts/freescale/fsl-lx2160a-bluebox3.dtb:
>    fsl-mc@80c000000: dpmacs:ethernet@11: 'fixed-link' does not match any of the regexes: 'pinctrl-[0-9]+'
>         from schema $id: http://devicetree.org/schemas/misc/fsl,qoriq-mc.yaml#
> 
> Signed-off-by: Frank Li <Frank.Li@nxp.com>

Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Best regards,
Krzysztof

Re: [PATCH v3 1/1] dt-bindings: net: fsl,qoriq-mc-dpmac: using unevaluatedProperties

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net-next.git (main)
by Jakub Kicinski <kuba@kernel.org>:

On Sun, 11 Aug 2024 14:40:49 -0400 you wrote:
> Replace additionalProperties with unevaluatedProperties because it have
> allOf: $ref: ethernet-controller.yaml#.
> 
> Remove all properties, which already defined in ethernet-controller.yaml.
> 
> Fixed below CHECK_DTBS warnings:
> arch/arm64/boot/dts/freescale/fsl-lx2160a-bluebox3.dtb:
>    fsl-mc@80c000000: dpmacs:ethernet@11: 'fixed-link' does not match any of the regexes: 'pinctrl-[0-9]+'
>         from schema $id: http://devicetree.org/schemas/misc/fsl,qoriq-mc.yaml#
> 
> [...]

Here is the summary with links:
  - [v3,1/1] dt-bindings: net: fsl,qoriq-mc-dpmac: using unevaluatedProperties
    https://git.kernel.org/netdev/net-next/c/be034ee6c33d

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html

Re: [PATCH v3 1/1] dt-bindings: net: fsl,qoriq-mc-dpmac: using unevaluatedProperties: manual merge

[Matthieu Baerts]

[-- Attachment #1: Type: text/plain, Size: 1713 bytes --]

Hi Frank,

On 11/08/2024 20:40, Frank Li wrote:
> Replace additionalProperties with unevaluatedProperties because it have
> allOf: $ref: ethernet-controller.yaml#.
> 
> Remove all properties, which already defined in ethernet-controller.yaml.
> 
> Fixed below CHECK_DTBS warnings:
> arch/arm64/boot/dts/freescale/fsl-lx2160a-bluebox3.dtb:
>    fsl-mc@80c000000: dpmacs:ethernet@11: 'fixed-link' does not match any of the regexes: 'pinctrl-[0-9]+'
>         from schema $id: http://devicetree.org/schemas/misc/fsl,qoriq-mc.yaml#

FYI, we got a small conflict when merging 'net' in 'net-next' in the
MPTCP tree due to this patch applied in 'net':

  c25504a0ba36 ("dt-bindings: net: fsl,qoriq-mc-dpmac: add missed
property phys")

and this one from 'net-next':

  be034ee6c33d ("dt-bindings: net: fsl,qoriq-mc-dpmac: using
unevaluatedProperties")

----- Generic Message -----
The best is to avoid conflicts between 'net' and 'net-next' trees but if
they cannot be avoided when preparing patches, a note about how to fix
them is much appreciated.

The conflict has been resolved on our side[1] and the resolution we
suggest is attached to this email. Please report any issues linked to
this conflict resolution as it might be used by others. If you worked on
the mentioned patches, don't hesitate to ACK this conflict resolution.
---------------------------

Regarding this conflict, a merge of the two modifications has been
taken: adding 'phys', and removing 'managed'

Rerere cache is available in [2].

Cheers,
Matt

1: https://github.com/multipath-tcp/mptcp_net-next/commit/691930dfa066
2: https://github.com/multipath-tcp/mptcp-upstream-rr-cache/commit/d15f8

Cheers,
Matt
-- 
Sponsored by the NGI0 Core fund.

[-- Attachment #2: 691930dfa066cc019020ee32efc7a795736dc1e6.patch --]
[-- Type: text/x-patch, Size: 526 bytes --]

diff --cc Documentation/devicetree/bindings/net/fsl,qoriq-mc-dpmac.yaml
index 42f9843d1868,f19c4fa66f18..be8a2163b73e
--- a/Documentation/devicetree/bindings/net/fsl,qoriq-mc-dpmac.yaml
+++ b/Documentation/devicetree/bindings/net/fsl,qoriq-mc-dpmac.yaml
@@@ -36,12 -30,6 +30,10 @@@ properties
        A reference to a node representing a PCS PHY device found on
        the internal MDIO bus.
  
-   managed: true
- 
 +  phys:
 +    description: A reference to the SerDes lane(s)
 +    maxItems: 1
 +
  required:
    - reg
  

Re: [PATCH v3 1/1] dt-bindings: net: fsl,qoriq-mc-dpmac: using unevaluatedProperties: manual merge

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 628 bytes --]

Hi Matthieu,

On Wed, 14 Aug 2024 11:06:10 +0200 Matthieu Baerts <matttbe@kernel.org> wrote:
>
> FYI, we got a small conflict when merging 'net' in 'net-next' in the
> MPTCP tree due to this patch applied in 'net':
> 
>   c25504a0ba36 ("dt-bindings: net: fsl,qoriq-mc-dpmac: add missed
> property phys")
> 
> and this one from 'net-next':
> 
>   be034ee6c33d ("dt-bindings: net: fsl,qoriq-mc-dpmac: using
> unevaluatedProperties")
>
> Regarding this conflict, a merge of the two modifications has been
> taken: adding 'phys', and removing 'managed'

Thanks for the heads up.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]