dt-bindings: i2c: stm32-i2c: Move st,syscfg-fmp definition to top level
authorRob Herring <robh@kernel.org>
Wed, 19 Jan 2022 17:44:07 +0000 (11:44 -0600)
committerRob Herring <robh@kernel.org>
Fri, 4 Feb 2022 15:43:43 +0000 (09:43 -0600)
It is preferred to define all properties in the main schema and leave
if/then/else schemas to just be further constraints on properties.

Rework the schema to use be more specific for each cell. Previously,
multiple entries of 3 cells each was allowed.

Signed-off-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20220119174407.3810088-1-robh@kernel.org
Documentation/devicetree/bindings/i2c/st,stm32-i2c.yaml

index 46b62e1..dccbb18 100644 (file)
@@ -25,16 +25,9 @@ allOf:
 
         i2c-scl-falling-time-ns:
           default: 10
-
-        st,syscfg-fmp:
-          description: Use to set Fast Mode Plus bit within SYSCFG when
-                       Fast Mode Plus speed is selected by slave.
-                       Format is phandle to syscfg / register offset within
-                       syscfg / register bitmask for FMP bit.
-          $ref: "/schemas/types.yaml#/definitions/phandle-array"
-          items:
-            minItems: 3
-            maxItems: 3
+    else:
+      properties:
+        st,syscfg-fmp: false
 
   - if:
       properties:
@@ -87,6 +80,16 @@ properties:
     minimum: 1
     maximum: 1000000
 
+  st,syscfg-fmp:
+    description: Use to set Fast Mode Plus bit within SYSCFG when Fast Mode
+      Plus speed is selected by slave.
+    $ref: "/schemas/types.yaml#/definitions/phandle-array"
+    items:
+      - items:
+          - description: phandle to syscfg
+          - description: register offset within syscfg
+          - description: register bitmask for FMP bit
+
 required:
   - compatible
   - reg
@@ -147,4 +150,3 @@ examples:
           i2c-scl-falling-time-ns = <20>;
           st,syscfg-fmp = <&syscfg 0x4 0x2>;
       };
-...