| Message ID | 20210322044707.19479-2-samuel@sholland.org |
|---|---|
| State | Accepted |
| Commit | 5bd15031337f544891185361899db40961d9044e |
| Headers | show |
| Series | [v2,1/5] dt-bindings: timer: Simplify conditional expressions | expand |
On Sun, 21 Mar 2021 23:47:03 -0500, Samuel Holland wrote: > The sun4i timer IP block has a variable number of interrupts based on > the compatible. Use enums to combine the two sections for the existing > 3-interrupt variants, and to simplify adding new compatible strings. > > Acked-by: Maxime Ripard <maxime@cerno.tech> > Signed-off-by: Samuel Holland <samuel@sholland.org> > --- > .../timer/allwinner,sun4i-a10-timer.yaml | 25 ++++++------------- > 1 file changed, 7 insertions(+), 18 deletions(-) > Reviewed-by: Rob Herring <robh@kernel.org>
diff --git a/Documentation/devicetree/bindings/timer/allwinner,sun4i-a10-timer.yaml b/Documentation/devicetree/bindings/timer/allwinner,sun4i-a10-timer.yaml index 1c7cf32e7ac2..3462598e609d 100644 --- a/Documentation/devicetree/bindings/timer/allwinner,sun4i-a10-timer.yaml +++ b/Documentation/devicetree/bindings/timer/allwinner,sun4i-a10-timer.yaml @@ -34,8 +34,8 @@ allOf: - if: properties: compatible: - items: - const: allwinner,sun4i-a10-timer + enum: + - allwinner,sun4i-a10-timer then: properties: @@ -46,8 +46,8 @@ allOf: - if: properties: compatible: - items: - const: allwinner,sun8i-a23-timer + enum: + - allwinner,sun8i-a23-timer then: properties: @@ -58,20 +58,9 @@ allOf: - if: properties: compatible: - items: - const: allwinner,sun8i-v3s-timer - - then: - properties: - interrupts: - minItems: 3 - maxItems: 3 - - - if: - properties: - compatible: - items: - const: allwinner,suniv-f1c100s-timer + enum: + - allwinner,sun8i-v3s-timer + - allwinner,suniv-f1c100s-timer then: properties: