On Wed, May 06, 2026 at 05:50:42PM +0100, Conor Dooley wrote:
> On Wed, May 06, 2026 at 02:28:15PM +0200, Gregor Herburger wrote:
> > Add a compatible string for the bcm2712 firmware.
> > 
> > Signed-off-by: Gregor Herburger <[email protected]>
> > ---
> >  .../bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml      | 13 
> > ++++++++++---
> >  1 file changed, 10 insertions(+), 3 deletions(-)
> > 
> > diff --git 
> > a/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml
> >  
> > b/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml
> > index 983ea80eaec9..fbcfa2bc168a 100644
> > --- 
> > a/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml
> > +++ 
> > b/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml
> > @@ -21,9 +21,16 @@ select:
> >  
> >  properties:
> >    compatible:
> > -    items:
> > -      - const: raspberrypi,bcm2835-firmware
> > -      - const: simple-mfd
> > +    oneOf:
> > +      - items:
> > +          - enum:
> > +              - raspberrypi,bcm2712-firmware
> > +              - raspberrypi,bcm2835-firmware
> > +          - const: simple-mfd
> > +      - items:
> > +          - const: raspberrypi,bcm2712-firmware
> > +          - const: raspberrypi,bcm2835-firmware
> > +          - const: simple-mfd
> 
> This diff doesn't make sense, either the new firmware is compatible with
> the old one or it is not. It shouldn't appear twice.

Ok. I will change it to:
-    items:
-      - const: raspberrypi,bcm2835-firmware
-      - const: simple-mfd
+    oneOf:
+      - items:
+          - const: raspberrypi,bcm2835-firmware
+          - const: simple-mfd
+      - items:
+          - const: raspberrypi,bcm2712-firmware
+          - const: raspberrypi,bcm2835-firmware
+          - const: simple-mfd

While reading the writing-schema.rst documentation I saw that it says most
bindings shouldn't need a select. Imho the select in this file doesn't add
anything which isn't covered witht the compatible. I wonder if I should drop the
select block?

Regards
Gregor

Reply via email to