[PATCH] dt-bindings: mfd: dlg,da9063: allow 'interrupts-extended' property

[PATCH] dt-bindings: mfd: dlg,da9063: allow 'interrupts-extended' property

[Wolfram Sang]

If nested, DT schema cannot extend required 'interrupts' to include
'interrupts-extended'. It needs to be added manually. Fixes:

arch/arm/boot/dts/renesas/r8a7791-koelsch.dtb: pmic@58 (dlg,da9063): 'interrupts' is a required property
	from schema $id: http://devicetree.org/schemas/mfd/dlg,da9063.yaml#

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---

Copied this solution 1:1 from:
  Documentation/devicetree/bindings/mfd/samsung,s2mps11.yaml

 Documentation/devicetree/bindings/mfd/dlg,da9063.yaml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/mfd/dlg,da9063.yaml b/Documentation/devicetree/bindings/mfd/dlg,da9063.yaml
index 51612dc22748..4af5fcb856c7 100644
--- a/Documentation/devicetree/bindings/mfd/dlg,da9063.yaml
+++ b/Documentation/devicetree/bindings/mfd/dlg,da9063.yaml
@@ -110,10 +110,16 @@ allOf:
             "^buck[1-4]$": false
         thermal: false
       required:
-        - interrupts
         - interrupt-controller
         - '#interrupt-cells'
 
+      # oneOf is required, because dtschema's fixups.py doesn't handle this
+      # nesting here. Its special treatment to allow either interrupt property
+      # when only one is specified in the binding works at the top level only.
+      oneOf:
+        - required: [interrupts]
+        - required: [interrupts-extended]
+
   - if:
       properties:
         compatible:
-- 
2.47.2

Re: [PATCH] dt-bindings: mfd: dlg,da9063: allow 'interrupts-extended' property

[Rob Herring]

On Mon, Sep 29, 2025 at 09:20:47AM +0200, Wolfram Sang wrote:
> If nested, DT schema cannot extend required 'interrupts' to include
> 'interrupts-extended'. It needs to be added manually. Fixes:
> 
> arch/arm/boot/dts/renesas/r8a7791-koelsch.dtb: pmic@58 (dlg,da9063): 'interrupts' is a required property
> 	from schema $id: http://devicetree.org/schemas/mfd/dlg,da9063.yaml#
> 
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> ---
> 
> Copied this solution 1:1 from:
>   Documentation/devicetree/bindings/mfd/samsung,s2mps11.yaml
> 
>  Documentation/devicetree/bindings/mfd/dlg,da9063.yaml | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/Documentation/devicetree/bindings/mfd/dlg,da9063.yaml b/Documentation/devicetree/bindings/mfd/dlg,da9063.yaml
> index 51612dc22748..4af5fcb856c7 100644
> --- a/Documentation/devicetree/bindings/mfd/dlg,da9063.yaml
> +++ b/Documentation/devicetree/bindings/mfd/dlg,da9063.yaml
> @@ -110,10 +110,16 @@ allOf:
>              "^buck[1-4]$": false
>          thermal: false
>        required:
> -        - interrupts
>          - interrupt-controller
>          - '#interrupt-cells'
>  
> +      # oneOf is required, because dtschema's fixups.py doesn't handle this
> +      # nesting here. Its special treatment to allow either interrupt property
> +      # when only one is specified in the binding works at the top level only.

The solution is to fix dtschema. I'll take a look at it.

> +      oneOf:
> +        - required: [interrupts]
> +        - required: [interrupts-extended]
> +
>    - if:
>        properties:
>          compatible:
> -- 
> 2.47.2
> 

Re: [PATCH] dt-bindings: mfd: dlg,da9063: allow 'interrupts-extended' property

[Wolfram Sang]

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


> > +      # oneOf is required, because dtschema's fixups.py doesn't handle this
> > +      # nesting here. Its special treatment to allow either interrupt property
> > +      # when only one is specified in the binding works at the top level only.
> 
> The solution is to fix dtschema. I'll take a look at it.

Thank you!


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH] dt-bindings: mfd: dlg,da9063: allow 'interrupts-extended' property

[Rob Herring]

On Wed, Oct 1, 2025 at 7:51 AM Rob Herring <robh@kernel.org> wrote:
>
> On Mon, Sep 29, 2025 at 09:20:47AM +0200, Wolfram Sang wrote:
> > If nested, DT schema cannot extend required 'interrupts' to include
> > 'interrupts-extended'. It needs to be added manually. Fixes:
> >
> > arch/arm/boot/dts/renesas/r8a7791-koelsch.dtb: pmic@58 (dlg,da9063): 'interrupts' is a required property
> >       from schema $id: http://devicetree.org/schemas/mfd/dlg,da9063.yaml#
> >
> > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> > ---
> >
> > Copied this solution 1:1 from:
> >   Documentation/devicetree/bindings/mfd/samsung,s2mps11.yaml
> >
> >  Documentation/devicetree/bindings/mfd/dlg,da9063.yaml | 8 +++++++-
> >  1 file changed, 7 insertions(+), 1 deletion(-)
> >
> > diff --git a/Documentation/devicetree/bindings/mfd/dlg,da9063.yaml b/Documentation/devicetree/bindings/mfd/dlg,da9063.yaml
> > index 51612dc22748..4af5fcb856c7 100644
> > --- a/Documentation/devicetree/bindings/mfd/dlg,da9063.yaml
> > +++ b/Documentation/devicetree/bindings/mfd/dlg,da9063.yaml
> > @@ -110,10 +110,16 @@ allOf:
> >              "^buck[1-4]$": false
> >          thermal: false
> >        required:
> > -        - interrupts
> >          - interrupt-controller
> >          - '#interrupt-cells'
> >
> > +      # oneOf is required, because dtschema's fixups.py doesn't handle this
> > +      # nesting here. Its special treatment to allow either interrupt property
> > +      # when only one is specified in the binding works at the top level only.
>
> The solution is to fix dtschema. I'll take a look at it.

Now fixed in 'main' branch. There's a handful of other cases fixed
too. Had nothing to do with nesting as most cases were ones where
'interrupts' was only defined in a referenced schema, but then
required in the outer schema.

Rob

Re: [PATCH] dt-bindings: mfd: dlg,da9063: allow 'interrupts-extended' property

[Wolfram Sang]

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

Hi Rob,

> Now fixed in 'main' branch. There's a handful of other cases fixed

Confirmed. Thank you a lot for this!

Did you already clean up the reference I got this from
(mfd/samsung,s2mps11.yaml) or shall I?

All the best,

   Wolfram


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH] dt-bindings: mfd: dlg,da9063: allow 'interrupts-extended' property

[Rob Herring]

On Wed, Oct 1, 2025 at 1:01 PM Wolfram Sang
<wsa+renesas@sang-engineering.com> wrote:
>
> Hi Rob,
>
> > Now fixed in 'main' branch. There's a handful of other cases fixed
>
> Confirmed. Thank you a lot for this!
>
> Did you already clean up the reference I got this from
> (mfd/samsung,s2mps11.yaml) or shall I?

Probably should wait a bit on that until I make a release. That will
probably be in the next few weeks.

Rob