diff mbox series

[1/4] dt-bindings: net: fec: simplify yaml

Message ID 20211120115825.851798-2-peng.fan@oss.nxp.com (mailing list archive)
State Not Applicable
Delegated to: Netdev Maintainers
Headers show
Series dt-bindings/dts: add i.MX8ULP FEC | expand

Checks

Context Check Description
netdev/tree_selection success Not a local patch

Commit Message

Peng Fan (OSS) Nov. 20, 2021, 11:58 a.m. UTC 
From: Peng Fan <peng.fan@nxp.com>

i.MX7D, i.MX8MQ and i.MX8QM are compatible with i.MX6SX, so no need
to split them into three items.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
 Documentation/devicetree/bindings/net/fsl,fec.yaml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

Comments

Joakim Zhang Nov. 22, 2021, 2:07 a.m. UTC | #1 
Hi Peng,

Thanks a lot for helping upstream this patch set.

For this change, have you run 'make dtbs_check'? I remember that split them to pass dtbs_check when convert it into yaml.

Best Regards,
Joakim Zhang
> -----Original Message-----
> From: Peng Fan (OSS) <peng.fan@oss.nxp.com>
> Sent: 2021年11月20日 19:58
> To: robh+dt@kernel.org; Aisheng Dong <aisheng.dong@nxp.com>; Joakim
> Zhang <qiangqing.zhang@nxp.com>; davem@davemloft.net;
> kuba@kernel.org; shawnguo@kernel.org; s.hauer@pengutronix.de
> Cc: kernel@pengutronix.de; festevam@gmail.com; dl-linux-imx
> <linux-imx@nxp.com>; netdev@vger.kernel.org;
> devicetree@vger.kernel.org; linux-kernel@vger.kernel.org;
> linux-arm-kernel@lists.infradead.org; Peng Fan <peng.fan@nxp.com>
> Subject: [PATCH 1/4] dt-bindings: net: fec: simplify yaml
> 
> From: Peng Fan <peng.fan@nxp.com>
> 
> i.MX7D, i.MX8MQ and i.MX8QM are compatible with i.MX6SX, so no need to
> split them into three items.
> 
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
> ---
>  Documentation/devicetree/bindings/net/fsl,fec.yaml | 8 ++------
>  1 file changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/net/fsl,fec.yaml
> b/Documentation/devicetree/bindings/net/fsl,fec.yaml
> index eca41443fcce..dbf63a9c2a46 100644
> --- a/Documentation/devicetree/bindings/net/fsl,fec.yaml
> +++ b/Documentation/devicetree/bindings/net/fsl,fec.yaml
> @@ -39,9 +39,8 @@ properties:
>        - items:
>            - enum:
>                - fsl,imx7d-fec
> -          - const: fsl,imx6sx-fec
> -      - items:
> -          - const: fsl,imx8mq-fec
> +              - fsl,imx8mq-fec
> +              - fsl,imx8qm-fec
>            - const: fsl,imx6sx-fec
>        - items:
>            - enum:
> @@ -50,9 +49,6 @@ properties:
>                - fsl,imx8mp-fec
>            - const: fsl,imx8mq-fec
>            - const: fsl,imx6sx-fec
> -      - items:
> -          - const: fsl,imx8qm-fec
> -          - const: fsl,imx6sx-fec
>        - items:
>            - enum:
>                - fsl,imx8qxp-fec
> --
> 2.25.1
Peng Fan Nov. 23, 2021, 9:29 a.m. UTC | #2 
> Subject: RE: [PATCH 1/4] dt-bindings: net: fec: simplify yaml
> 
> 
> Hi Peng,
> 
> Thanks a lot for helping upstream this patch set.
> 
> For this change, have you run 'make dtbs_check'? I remember that split them
> to pass dtbs_check when convert it into yaml.

" arch/arm/boot/dts/imx6dl-nitrogen6x.dt.yaml: 
ethernet@2188000: More than one condition true in oneOf schema: "

But this is not introduced by my patch, it already there even drop my
patch.

I not see other issues.

Thanks,
Peng.

> 
> Best Regards,
> Joakim Zhang
> > -----Original Message-----
> > From: Peng Fan (OSS) <peng.fan@oss.nxp.com>
> > Sent: 2021年11月20日 19:58
> > To: robh+dt@kernel.org; Aisheng Dong <aisheng.dong@nxp.com>; Joakim
> > Zhang <qiangqing.zhang@nxp.com>; davem@davemloft.net;
> kuba@kernel.org;
> > shawnguo@kernel.org; s.hauer@pengutronix.de
> > Cc: kernel@pengutronix.de; festevam@gmail.com; dl-linux-imx
> > <linux-imx@nxp.com>; netdev@vger.kernel.org;
> > devicetree@vger.kernel.org; linux-kernel@vger.kernel.org;
> > linux-arm-kernel@lists.infradead.org; Peng Fan <peng.fan@nxp.com>
> > Subject: [PATCH 1/4] dt-bindings: net: fec: simplify yaml
> >
> > From: Peng Fan <peng.fan@nxp.com>
> >
> > i.MX7D, i.MX8MQ and i.MX8QM are compatible with i.MX6SX, so no need
> to
> > split them into three items.
> >
> > Signed-off-by: Peng Fan <peng.fan@nxp.com>
> > ---
> >  Documentation/devicetree/bindings/net/fsl,fec.yaml | 8 ++------
> >  1 file changed, 2 insertions(+), 6 deletions(-)
> >
> > diff --git a/Documentation/devicetree/bindings/net/fsl,fec.yaml
> > b/Documentation/devicetree/bindings/net/fsl,fec.yaml
> > index eca41443fcce..dbf63a9c2a46 100644
> > --- a/Documentation/devicetree/bindings/net/fsl,fec.yaml
> > +++ b/Documentation/devicetree/bindings/net/fsl,fec.yaml
> > @@ -39,9 +39,8 @@ properties:
> >        - items:
> >            - enum:
> >                - fsl,imx7d-fec
> > -          - const: fsl,imx6sx-fec
> > -      - items:
> > -          - const: fsl,imx8mq-fec
> > +              - fsl,imx8mq-fec
> > +              - fsl,imx8qm-fec
> >            - const: fsl,imx6sx-fec
> >        - items:
> >            - enum:
> > @@ -50,9 +49,6 @@ properties:
> >                - fsl,imx8mp-fec
> >            - const: fsl,imx8mq-fec
> >            - const: fsl,imx6sx-fec
> > -      - items:
> > -          - const: fsl,imx8qm-fec
> > -          - const: fsl,imx6sx-fec
> >        - items:
> >            - enum:
> >                - fsl,imx8qxp-fec
> > --
> > 2.25.1
Joakim Zhang Nov. 23, 2021, 10:39 a.m. UTC | #3 
Hi Peng,

> -----Original Message-----
> From: Peng Fan <peng.fan@nxp.com>
> Sent: 2021年11月23日 17:29
> To: Joakim Zhang <qiangqing.zhang@nxp.com>; Peng Fan (OSS)
> <peng.fan@oss.nxp.com>; robh+dt@kernel.org; Aisheng Dong
> <aisheng.dong@nxp.com>; davem@davemloft.net; kuba@kernel.org;
> shawnguo@kernel.org; s.hauer@pengutronix.de
> Cc: kernel@pengutronix.de; festevam@gmail.com; dl-linux-imx
> <linux-imx@nxp.com>; netdev@vger.kernel.org;
> devicetree@vger.kernel.org; linux-kernel@vger.kernel.org;
> linux-arm-kernel@lists.infradead.org
> Subject: RE: [PATCH 1/4] dt-bindings: net: fec: simplify yaml
> 
> > Subject: RE: [PATCH 1/4] dt-bindings: net: fec: simplify yaml
> >
> >
> > Hi Peng,
> >
> > Thanks a lot for helping upstream this patch set.
> >
> > For this change, have you run 'make dtbs_check'? I remember that split
> > them to pass dtbs_check when convert it into yaml.
> 
> " arch/arm/boot/dts/imx6dl-nitrogen6x.dt.yaml:
> ethernet@2188000: More than one condition true in oneOf schema: "
> 
> But this is not introduced by my patch, it already there even drop my patch.
> 
> I not see other issues.


For this error: ethernet@2188000: More than one condition true in oneOf schema:

This is caused by ['interrupts'] and ['interrupts-extended'], this should be a common limitation, this is a known warning. 
         'oneOf': [{'required': ['interrupts']},
                   {'required': ['interrupts-extended']}],

After applying this patch, I verified on both arm and arm64 platforms, indeed there is no regression targets to ['compatible']. I am okay with this patch, sorry for this inconvenience.

Best Regards,
Joakim Zhang
> Thanks,
> Peng.
> 
> >
> > Best Regards,
> > Joakim Zhang
> > > -----Original Message-----
> > > From: Peng Fan (OSS) <peng.fan@oss.nxp.com>
> > > Sent: 2021年11月20日 19:58
> > > To: robh+dt@kernel.org; Aisheng Dong <aisheng.dong@nxp.com>;
> Joakim
> > > Zhang <qiangqing.zhang@nxp.com>; davem@davemloft.net;
> > kuba@kernel.org;
> > > shawnguo@kernel.org; s.hauer@pengutronix.de
> > > Cc: kernel@pengutronix.de; festevam@gmail.com; dl-linux-imx
> > > <linux-imx@nxp.com>; netdev@vger.kernel.org;
> > > devicetree@vger.kernel.org; linux-kernel@vger.kernel.org;
> > > linux-arm-kernel@lists.infradead.org; Peng Fan <peng.fan@nxp.com>
> > > Subject: [PATCH 1/4] dt-bindings: net: fec: simplify yaml
> > >
> > > From: Peng Fan <peng.fan@nxp.com>
> > >
> > > i.MX7D, i.MX8MQ and i.MX8QM are compatible with i.MX6SX, so no need
> > to
> > > split them into three items.
> > >
> > > Signed-off-by: Peng Fan <peng.fan@nxp.com>
> > > ---
> > >  Documentation/devicetree/bindings/net/fsl,fec.yaml | 8 ++------
> > >  1 file changed, 2 insertions(+), 6 deletions(-)
> > >
> > > diff --git a/Documentation/devicetree/bindings/net/fsl,fec.yaml
> > > b/Documentation/devicetree/bindings/net/fsl,fec.yaml
> > > index eca41443fcce..dbf63a9c2a46 100644
> > > --- a/Documentation/devicetree/bindings/net/fsl,fec.yaml
> > > +++ b/Documentation/devicetree/bindings/net/fsl,fec.yaml
> > > @@ -39,9 +39,8 @@ properties:
> > >        - items:
> > >            - enum:
> > >                - fsl,imx7d-fec
> > > -          - const: fsl,imx6sx-fec
> > > -      - items:
> > > -          - const: fsl,imx8mq-fec
> > > +              - fsl,imx8mq-fec
> > > +              - fsl,imx8qm-fec
> > >            - const: fsl,imx6sx-fec
> > >        - items:
> > >            - enum:
> > > @@ -50,9 +49,6 @@ properties:
> > >                - fsl,imx8mp-fec
> > >            - const: fsl,imx8mq-fec
> > >            - const: fsl,imx6sx-fec
> > > -      - items:
> > > -          - const: fsl,imx8qm-fec
> > > -          - const: fsl,imx6sx-fec
> > >        - items:
> > >            - enum:
> > >                - fsl,imx8qxp-fec
> > > --
> > > 2.25.1
Rob Herring (Arm) Nov. 30, 2021, 2:03 a.m. UTC | #4 
On Sat, 20 Nov 2021 19:58:22 +0800, Peng Fan (OSS) wrote:
> From: Peng Fan <peng.fan@nxp.com>
> 
> i.MX7D, i.MX8MQ and i.MX8QM are compatible with i.MX6SX, so no need
> to split them into three items.
> 
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
> ---
>  Documentation/devicetree/bindings/net/fsl,fec.yaml | 8 ++------
>  1 file changed, 2 insertions(+), 6 deletions(-)
> 

Reviewed-by: Rob Herring <robh@kernel.org>
diff mbox series

Patch

diff --git a/Documentation/devicetree/bindings/net/fsl,fec.yaml b/Documentation/devicetree/bindings/net/fsl,fec.yaml
index eca41443fcce..dbf63a9c2a46 100644
--- a/Documentation/devicetree/bindings/net/fsl,fec.yaml
+++ b/Documentation/devicetree/bindings/net/fsl,fec.yaml
@@ -39,9 +39,8 @@  properties:
       - items:
           - enum:
               - fsl,imx7d-fec
-          - const: fsl,imx6sx-fec
-      - items:
-          - const: fsl,imx8mq-fec
+              - fsl,imx8mq-fec
+              - fsl,imx8qm-fec
           - const: fsl,imx6sx-fec
       - items:
           - enum:
@@ -50,9 +49,6 @@  properties:
               - fsl,imx8mp-fec
           - const: fsl,imx8mq-fec
           - const: fsl,imx6sx-fec
-      - items:
-          - const: fsl,imx8qm-fec
-          - const: fsl,imx6sx-fec
       - items:
           - enum:
               - fsl,imx8qxp-fec