On Wed, May 18, 2022 at 12:56:17PM -0700, Stephen Boyd wrote:
> Quoting Rob Herring (2022-05-18 09:13:48)
> > On Mon, May 16, 2022 at 12:23:03PM -0700, Stephen Boyd wrote:
> > > Quoting Rob Herring (2022-05-16 08:20:03)
> > > > On Wed, May 11, 2022 at 06:39:21PM -0700, Stephen Boyd wrote:
> > > > > diff --git a/Documentation/devicetree/bindings/mfd/google,cros-ec.yaml b/Documentation/devicetree/bindings/mfd/google,cros-ec.yaml
> > > > > index 409ecef967ce..e5fe60beb9fe 100644
> > > > > --- a/Documentation/devicetree/bindings/mfd/google,cros-ec.yaml
> > > > > +++ b/Documentation/devicetree/bindings/mfd/google,cros-ec.yaml
> > > > > + - items:
> > > > > + - const: google,cros-ec-i2c
> > > > > + # For implementations of the FPMCU connected through SPI.
> > > > > + - items:
> > > > > + - const: google,cros-ec-fp
> > > > > + - const: google,cros-ec-spi
> > > > > + # For implementations of the EC is connected through SPI.
> > > > > + - items:
> > > > > + - const: google,cros-ec-spi
> > > > > + # For implementations of the EC is connected through RPMSG.
> > > > > + - items:
> > > > > + - const: google,cros-ec-rpmsg
> > > > >
> > > > > controller-data:
> > > > > description:
> > > > > @@ -176,6 +189,37 @@ allOf:
> > > > > - reg
> > > > > - interrupts
> > > > >
> > > > > + - if:
> > > > > + properties:
> > > > > + compatible:
> > > > > + contains:
> > > > > + const: google,cros-ec-fp
> > > > > + then:
> > > > > + properties:
> > > > > + '#address-cells': false
> > > > > + '#size-cells': false
> > > > > + typec: false
> > > > > + ec-pwm: false
> > > > > + keyboard-controller: false
> > > > > + proximity: false
> > > > > + codecs: false
> > > > > + cbas: false
> > > > > +
> > > > > + patternProperties:
> > > > > + "^i2c-tunnel[0-9]*$": false
> > > > > + "^regulator@[0-9]+$": false
> > > > > + "^extcon[0-9]*$": false
> > > >
> > > > Is the list of what's allowed shorter? If so, you could list those
> > > > properties and use 'additionalProperties: false'.
> > >
> > > Yes.
> > >
> > > >
> > > > Or maybe this is a sign that this should be a separate schema document.
> > >
> > > I couldn't figure that out. I tried to add new properties here but it
> > > didn't work.
> >
> > Like this?:
> >
> > then:
> > properties:
> > allowed-prop-1: true
> > allowed-prop-2: true
> > allowed-prop-3: true
> > additionalProperties: false
>
> It doesn't seem to combine constraints?
>
> I get this error:
>
> Documentation/devicetree/bindings/mfd/google,cros-ec.example.dt.yaml:
> ec@0: Additional properties are not allowed ('$nodename' was unexpected)
That would be a bug or limitation in the tools. We would need to add
all the other properties we automatically add as well... I think either
leaving it as-is or a separate file is going to be the better route
here.
Rob
