| Message ID | 20200116005654.27672-4-andre.przywara@arm.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | arm64: dts: sun50i: H6: Enable SPI controller | expand |
Hi, On Thu, Jan 16, 2020 at 12:56:54AM +0000, Andre Przywara wrote: > The Allwinner H6 SPI controller has advanced features over the H3 > version, but remains compatible with it. > Document the usual "specific", "fallback" compatible string pair. > Also add the R40 version while at it. > > Signed-off-by: Andre Przywara <andre.przywara@arm.com> > --- > .../devicetree/bindings/spi/allwinner,sun6i-a31-spi.yaml | 12 +++++++++--- > 1 file changed, 9 insertions(+), 3 deletions(-) > > diff --git a/Documentation/devicetree/bindings/spi/allwinner,sun6i-a31-spi.yaml b/Documentation/devicetree/bindings/spi/allwinner,sun6i-a31-spi.yaml > index f36c46d236d7..c19dfbe42d90 100644 > --- a/Documentation/devicetree/bindings/spi/allwinner,sun6i-a31-spi.yaml > +++ b/Documentation/devicetree/bindings/spi/allwinner,sun6i-a31-spi.yaml > @@ -18,9 +18,15 @@ properties: > "#size-cells": true > > compatible: > - enum: > - - allwinner,sun6i-a31-spi > - - allwinner,sun8i-h3-spi > + oneOf: > + - const: allwinner,sun6i-a31-spi > + - const: allwinner,sun8i-h3-spi > + - items: > + - const: allwinner,sun8i-r40-spi > + - const: allwinner,sun8i-h3-spi > + - items: > + - const: allwinner,sun50i-h6-spi > + - const: allwinner,sun8i-h3-spi Having oneOf: - const: allwinner,sun6i-a31-spi - const: allwinner,sun8i-h3-spi - items: - enum: - allwinner,sun8i-r40-spi - allwinner,sun50i-h6-spi - const: allwinner,sun8i-h3-spi Will be easier to maintain in the long run Maxime
On Thu, 16 Jan 2020 15:23:01 +0100 Maxime Ripard <mripard@kernel.org> wrote: Hi, > On Thu, Jan 16, 2020 at 12:56:54AM +0000, Andre Przywara wrote: > > The Allwinner H6 SPI controller has advanced features over the H3 > > version, but remains compatible with it. > > Document the usual "specific", "fallback" compatible string pair. > > Also add the R40 version while at it. > > > > Signed-off-by: Andre Przywara <andre.przywara@arm.com> > > --- > > .../devicetree/bindings/spi/allwinner,sun6i-a31-spi.yaml | 12 +++++++++--- > > 1 file changed, 9 insertions(+), 3 deletions(-) > > > > diff --git a/Documentation/devicetree/bindings/spi/allwinner,sun6i-a31-spi.yaml b/Documentation/devicetree/bindings/spi/allwinner,sun6i-a31-spi.yaml > > index f36c46d236d7..c19dfbe42d90 100644 > > --- a/Documentation/devicetree/bindings/spi/allwinner,sun6i-a31-spi.yaml > > +++ b/Documentation/devicetree/bindings/spi/allwinner,sun6i-a31-spi.yaml > > @@ -18,9 +18,15 @@ properties: > > "#size-cells": true > > > > compatible: > > - enum: > > - - allwinner,sun6i-a31-spi > > - - allwinner,sun8i-h3-spi > > + oneOf: > > + - const: allwinner,sun6i-a31-spi > > + - const: allwinner,sun8i-h3-spi > > + - items: > > + - const: allwinner,sun8i-r40-spi > > + - const: allwinner,sun8i-h3-spi > > + - items: > > + - const: allwinner,sun50i-h6-spi > > + - const: allwinner,sun8i-h3-spi > > Having > > oneOf: > - const: allwinner,sun6i-a31-spi > - const: allwinner,sun8i-h3-spi > - items: > - enum: > - allwinner,sun8i-r40-spi > - allwinner,sun50i-h6-spi > - const: allwinner,sun8i-h3-spi > > Will be easier to maintain in the long run Ah, nice, I tried something like this, based on the example-schema.yaml file, but the example in there is more verbose, and looked much less readable. But your version seems to hit the sweet spot, so I will go with this. Thanks, Andre.
diff --git a/Documentation/devicetree/bindings/spi/allwinner,sun6i-a31-spi.yaml b/Documentation/devicetree/bindings/spi/allwinner,sun6i-a31-spi.yaml index f36c46d236d7..c19dfbe42d90 100644 --- a/Documentation/devicetree/bindings/spi/allwinner,sun6i-a31-spi.yaml +++ b/Documentation/devicetree/bindings/spi/allwinner,sun6i-a31-spi.yaml @@ -18,9 +18,15 @@ properties: "#size-cells": true compatible: - enum: - - allwinner,sun6i-a31-spi - - allwinner,sun8i-h3-spi + oneOf: + - const: allwinner,sun6i-a31-spi + - const: allwinner,sun8i-h3-spi + - items: + - const: allwinner,sun8i-r40-spi + - const: allwinner,sun8i-h3-spi + - items: + - const: allwinner,sun50i-h6-spi + - const: allwinner,sun8i-h3-spi reg: maxItems: 1
The Allwinner H6 SPI controller has advanced features over the H3 version, but remains compatible with it. Document the usual "specific", "fallback" compatible string pair. Also add the R40 version while at it. Signed-off-by: Andre Przywara <andre.przywara@arm.com> --- .../devicetree/bindings/spi/allwinner,sun6i-a31-spi.yaml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)