On Sun, 7 May 2023 18:03:33 +0300 Maksim Kiselev <bigunclemax@xxxxxxxxx> wrote: Hi, > Listed above Allwinner SoCs has two SPI controllers. First is the regular > SPI controller and the second one has additional functionality for > MIPI-DBI Type C. > > Add compatible strings for these controllers > > Signed-off-by: Maksim Kiselev <bigunclemax@xxxxxxxxx> > Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx> > --- > .../devicetree/bindings/spi/allwinner,sun6i-a31-spi.yaml | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/Documentation/devicetree/bindings/spi/allwinner,sun6i-a31-spi.yaml b/Documentation/devicetree/bindings/spi/allwinner,sun6i-a31-spi.yaml > index de36c6a34a0f..ab2d8a03011e 100644 > --- a/Documentation/devicetree/bindings/spi/allwinner,sun6i-a31-spi.yaml > +++ b/Documentation/devicetree/bindings/spi/allwinner,sun6i-a31-spi.yaml > @@ -19,6 +19,7 @@ properties: > > compatible: > oneOf: > + - const: allwinner,sun50i-r329-spi > - const: allwinner,sun6i-a31-spi > - const: allwinner,sun8i-h3-spi > - items: > @@ -28,6 +29,12 @@ properties: > - allwinner,sun50i-h616-spi > - allwinner,suniv-f1c100s-spi > - const: allwinner,sun8i-h3-spi > + - items: > + - enum: > + - allwinner,sun20i-d1-spi > + - allwinner,sun20i-d1-spi-dbi > + - allwinner,sun50i-r329-spi-dbi > + - const: allwinner,sun50i-r329-spi So this is still not right: It allows: "allwinner,sun20i-d1-spi-dbi", "allwinner,sun50i-r329-spi" which it shouldn't, but more importantly disallows the three string version that is introduced in patch 5/5, which makes dtbs_check fail. So we need to fix this. I think the simplest is probably: + - items: + - enum: + - allwinner,sun20i-d1-spi + - allwinner,sun50i-r329-spi-dbi + - const: allwinner,sun50i-r329-spi + - items: + - const: allwinner,sun20i-d1-spi-dbi + - const: allwinner,sun50i-r329-spi-dbi + - const: allwinner,sun50i-r329-spi Maybe there is a shorter sequence. This assumes we go with the three-string combo, of course. Cheers, Andre > > reg: > maxItems: 1
