Remove 'allOf' when used with '$ref'

In json-schema 2019.09 syntax, keywords in addition to an $ref are no
longer ignored so an 'allOf' is no longer needed. We fix this up when
preprocessing the schemas until jsonschema module has 2019.09 support.

Remove all the cases in the schemas and test schemas so others don't
copy the old syntax.

Signed-off-by: Rob Herring <[email protected]>

Author: robherring

schemas/cache-controller.yaml

@@ -15,9 +15,8 @@ properties:
     pattern: "^(cache-controller|cpu)(@[0-9a-f,]+)*$"
 
   cache-level:
-    allOf:
-      - $ref: "/schemas/types.yaml#/definitions/uint32"
-      - maximum: 32
+    $ref: "/schemas/types.yaml#/definitions/uint32"
+    maximum: 32
 
   cache-unified:
     $ref: "/schemas/types.yaml#/definitions/flag"

schemas/chosen.yaml

@@ -75,18 +75,16 @@ properties:
       a different secondary CPU release mechanism).
 
   linux,elfcorehdr:
-    allOf:
-      - $ref: types.yaml#/definitions/uint64-array
-      - maxItems: 2
+    $ref: types.yaml#/definitions/uint64-array
+    maxItems: 2
     description:
       This property (currently used only on arm64) holds the memory range,
       the address and the size, of the elf core header which mainly describes
       the panicked kernel\'s memory layout as PT_LOAD segments of elf format.
 
   linux,usable-memory-range:
-    allOf:
-      - $ref: types.yaml#/definitions/uint64-array
-      - maxItems: 2
+    $ref: types.yaml#/definitions/uint64-array
+    maxItems: 2
     description: |
       This property (arm64 only) holds a base address and size, describing a
       limited region in which memory may be considered available for use by
@@ -126,18 +124,16 @@ properties:
       linux,initrd-end is exclusive.
 
   linux,pci-probe-only:
-    allOf:
-      - $ref: types.yaml#/definitions/uint32
+    $ref: types.yaml#/definitions/uint32
     enum: [ 0, 1 ]
     description:
       Optional property which takes a single-cell argument. If '0', then Linux
       will assign devices in its usual manner, otherwise it will not try to
       assign devices and instead use them as they are configured already.
 
   stdout-path:
-    allOf:
-      - $ref: types.yaml#/definitions/string
-      - pattern: "^[a-zA-Z0-9@/,+\\-._]*(:[0-9]*[noe]?[78]?[r]?)?$"
+    $ref: types.yaml#/definitions/string
+    pattern: "^[a-zA-Z0-9@/,+\\-._]*(:[0-9]*[noe]?[78]?[r]?)?$"
     description: |
       Device trees may specify the device to be used for boot console output
       with a stdout-path property under /chosen, as described in the Devicetree

schemas/dt-core.yaml

@@ -18,8 +18,7 @@ properties:
   $nodename:
     $ref: "types.yaml#/definitions/string"
   compatible:
-    allOf:
-      - $ref: "types.yaml#/definitions/string-array"
+    $ref: "types.yaml#/definitions/string-array"
     items:
       pattern: "^[a-zA-Z][a-zA-Z0-9,+\\-._]+$"
   dma-coherent:
@@ -35,17 +34,13 @@ properties:
   reg:
     $ref: "types.yaml#/definitions/uint32-matrix"
   status:
-    allOf:
-      - $ref: "types.yaml#/definitions/string"
-      - items:
-          - enum: [ okay, disabled ]
+    $ref: "types.yaml#/definitions/string"
+    enum: [ okay, disabled ]
 patternProperties:
   "^#.*-cells$":
-    allOf:
-      - $ref: "types.yaml#/definitions/uint32"
-      - items:
-          - items:
-              maximum: 8
+    $ref: "types.yaml#/definitions/uint32"
+    items:
+      maximum: 8
 
   ".*-names$":
     $ref: "types.yaml#/definitions/non-unique-string-array"

schemas/gpio/gpio.yaml

@@ -19,11 +19,10 @@ properties:
   ngpios:
     $ref: "/schemas/types.yaml#/definitions/uint32"
   gpio-reserved-ranges:
-    allOf:
-      - $ref: "/schemas/types.yaml#/definitions/uint32-matrix"
-      - items:
-          minItems: 2
-          maxItems: 2
+    $ref: "/schemas/types.yaml#/definitions/uint32-matrix"
+    items:
+      minItems: 2
+      maxItems: 2
   gpio-ranges:
     $ref: "/schemas/types.yaml#/definitions/phandle-array"
 

schemas/pci/pci-bus.yaml

@@ -75,8 +75,7 @@ properties:
     const: pci
 
   bus-range:
-    allOf:
-      - $ref: /schemas/types.yaml#/definitions/uint32-array
+    $ref: /schemas/types.yaml#/definitions/uint32-array
     minItems: 2
     maxItems: 2
     items:
@@ -106,12 +105,10 @@ properties:
         maximum: 7
 
   linux,pci-domain:
-    allOf:
-      - $ref: /schemas/types.yaml#/definitions/uint32
+    $ref: /schemas/types.yaml#/definitions/uint32
 
   max-link-speed:
-    allOf:
-      - $ref: /schemas/types.yaml#/definitions/uint32
+    $ref: /schemas/types.yaml#/definitions/uint32
     enum: [ 1, 2, 3, 4 ]
 
   reset-gpios:
@@ -127,13 +124,11 @@ properties:
 
   vendor-id:
     description: The PCI vendor ID
-    allOf:
-      - $ref: /schemas/types.yaml#/definitions/uint32
+    $ref: /schemas/types.yaml#/definitions/uint32
 
   device-id:
     description: The PCI device ID
-    allOf:
-      - $ref: /schemas/types.yaml#/definitions/uint32
+    $ref: /schemas/types.yaml#/definitions/uint32
 
 patternProperties:
   "^[a-zA-Z][a-zA-Z0-9,+\\-._]{0,63}@1?[0-9a-f](,[0-7])?$":

test/schemas/good-example.yaml

@@ -88,110 +88,95 @@ properties:
     description: A vendor specific boolean property
 
   vendor,int-prop:
-    allOf:
-      - $ref: "/schemas/types.yaml#/definitions/uint32"
-      - enum: [ 1, 2, 3 ]
+    $ref: "/schemas/types.yaml#/definitions/uint32"
+    enum: [ 1, 2, 3 ]
     description: Vendor specific single cell integer property
 
   vendor,int-array-prop:
-    allOf:
-      - $ref: "/schemas/types.yaml#/definitions/uint32-array"
-      - items:
-          minimum: 5
-          maximum: 10
+    $ref: "/schemas/types.yaml#/definitions/uint32-array"
+    items:
+      minimum: 5
+      maximum: 10
     description: Vendor specific integer array property
 
   vendor,int-array-prop-2:
-    allOf:
-      - $ref: "/schemas/types.yaml#/definitions/uint32-array"
-      - items:
-          - const: 5
-          - const: 10
+    $ref: "/schemas/types.yaml#/definitions/uint32-array"
+    items:
+      - const: 5
+      - const: 10
     description: Vendor specific integer array property
 
   vendor,int-array-size-only-prop:
-    allOf:
-      - $ref: "/schemas/types.yaml#/definitions/uint32-array"
+    $ref: "/schemas/types.yaml#/definitions/uint32-array"
     minItems: 2
     maxItems: 5
     description: Vendor specific integer array property with only a size
       range. This can use either form of brackets.
 
   vendor,string-prop:
-    allOf:
-      - $ref: "/schemas/types.yaml#/definitions/string"
-      - enum:
-          - foo
-          - bar
+    $ref: "/schemas/types.yaml#/definitions/string"
+    enum:
+      - foo
+      - bar
     description: Vendor specific single string property
 
   vendor,string-list-prop:
-    allOf:
-     - $ref: "/schemas/types.yaml#/definitions/string-array"
-     - minItems: 2
-       items:
-         - const: foobar
-         - const: foobaz
+    $ref: "/schemas/types.yaml#/definitions/string-array"
+    minItems: 2
+    items:
+      - const: foobar
+      - const: foobaz
     description: Vendor specific string list property
 
   vendor,int8-prop:
     $ref: /schemas/types.yaml#/definitions/uint8
     description: Vendor specific 8-bit integer property
 
   vendor,int8-array-prop:
-    allOf:
-      - $ref: /schemas/types.yaml#/definitions/uint8-array
-      - items:
-          - minItems: 2
-            maxItems: 3
+    $ref: /schemas/types.yaml#/definitions/uint8-array
+    items:
+      - minItems: 2
+        maxItems: 3
     description: A vendor specific uint8 array property with 2 or 3 entries
 
   vendor,int16-prop:
-    allOf:
-      - $ref: /schemas/types.yaml#/definitions/uint16
-      - enum: [ 1, 2, 3 ]
+    $ref: /schemas/types.yaml#/definitions/uint16
+    enum: [ 1, 2, 3 ]
     description: Vendor specific 16-bit integer property
 
   vendor,int16-array-prop:
-    allOf:
-      - $ref: /schemas/types.yaml#/definitions/uint16-array
-      - items:
-          - const: 1
-          - const: 2
+    $ref: /schemas/types.yaml#/definitions/uint16-array
+    items:
+      - const: 1
+      - const: 2
     description: Vendor specific 16-bit integer array property
 
   vendor,int64-prop:
-    allOf:
-      - $ref: /schemas/types.yaml#/definitions/uint64
-      - items:
-        - items:
-            - minimum: 0x1234
+    $ref: /schemas/types.yaml#/definitions/uint64
+    minimum: 0x1234
 
     description: Vendor specific 16-bit integer property
 
   vendor,int64-array-prop:
-    allOf:
-      - $ref: /schemas/types.yaml#/definitions/uint64-array
+    $ref: /schemas/types.yaml#/definitions/uint64-array
     description: Vendor specific 64-bit integer array property
 
   vendor,phandle-prop:
     $ref: "/schemas/types.yaml#/definitions/phandle"
     description: Vendor specific single cell phandle property
 
   vendor,phandle-array-prop:
-    allOf:
-      - $ref: "/schemas/types.yaml#/definitions/phandle-array"
-      - minItems: 2
+    $ref: "/schemas/types.yaml#/definitions/phandle-array"
+    minItems: 2
     description: Vendor specific array of phandles property
 
   vendor,phandle-with-fixed-cells:
-    allOf:
-      - $ref: "/schemas/types.yaml#/definitions/phandle-array"
+    $ref: "/schemas/types.yaml#/definitions/phandle-array"
+    items:
       - items:
-          - items:
-            - description: the phandle to something
-            - description: the 1st cell data
-            - description: the 2nd cell data
+          - description: the phandle to something
+          - description: the 1st cell data
+          - description: the 2nd cell data
     description: Vendor specific array of phandles property