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)
with this interdiff. I added the spi properties to reduce the additional
properties that aren't allowed.
---8<----
diff --git a/Documentation/devicetree/bindings/mfd/google,cros-ec.yaml
b/Documentation/devicetree/bindings/mfd/google,cros-ec.yaml
index 04b847fd5070..d47c7a273026 100644
--- a/Documentation/devicetree/bindings/mfd/google,cros-ec.yaml
+++ b/Documentation/devicetree/bindings/mfd/google,cros-ec.yaml
@@ -18,24 +18,21 @@ description:
properties:
compatible:
- anyOf:
+ oneOf:
- description:
For implementations of the EC connected through I2C.
- - items:
- - const: google,cros-ec-i2c
+ const: google,cros-ec-i2c
- description:
For implementations of the FPMCU connected through SPI.
- - items:
+ items:
- const: google,cros-ec-fp
- const: google,cros-ec-spi
- description:
For implementations of the EC connected through SPI.
- - items:
- - const: google,cros-ec-spi
+ const: google,cros-ec-spi
- description:
For implementations of the EC connected through RPMSG.
- - items:
- - const: google,cros-ec-rpmsg
+ const: google,cros-ec-rpmsg
controller-data:
description:
@@ -200,19 +197,14 @@ allOf:
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
+ reset-gpios: true
+ boot0-gpios: true
+ vdd-supply: true
+ interrupts: true
+ compatible: true
+ reg: true
+ spi-max-frequency: true
+ additionalProperties: false
required:
- reset-gpios
>
> > And then when I tried to make a different schema document
> > it complained that the example for google,cros-ec-spi in here had a
> > problem.
>
> You probably need a custom 'select' so that both schemas aren't
> matching. Otherwise a schema is applied if any of the compatible strings
> match.
I see. Maybe that's better vs. jamming it all into one file.
>
> > Can properties be defined in this section?
>
> Yes, but discouraged for vendor specific properties. The if/then should
> really be just additional constraints.
Ok.
