Commit 5f0b06da authored by Rob Herring's avatar Rob Herring
Browse files

dt-bindings: Remove more cases of 'allOf' containing a '$ref' 



Another wack-a-mole pass of killing off unnecessary 'allOf + $ref'
usage.

json-schema versions draft7 and earlier have a weird behavior in that
any keywords combined with a '$ref' are ignored (silently). The correct
form was to put a '$ref' under an 'allOf'. This behavior is now changed
in the 2019-09 json-schema spec and '$ref' can be mixed with other
keywords. The json-schema library doesn't yet support this, but the
tooling now does a fixup for this and either way works.

This has been a constant source of review comments, so let's change this
treewide so everyone copies the simpler syntax.

Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent f516fb70

Documentation/devicetree/bindings/display/brcm,bcm2835-hdmi.yaml

+1 −2
Original line number Diff line number Diff line
@@ -32,8 +32,7 @@ properties: 
      - const: hdmi



  ddc:

    allOf:

      - $ref: /schemas/types.yaml#/definitions/phandle

    $ref: /schemas/types.yaml#/definitions/phandle

    description: >

      Phandle of the I2C controller used for DDC EDID probing

Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.yaml

+1 −2
Original line number Diff line number Diff line
@@ -97,8 +97,7 @@ patternProperties: 
            input signal is multiplied. For example, <1 3> indicates the signal is scaled

            down to 1/3 of its value before ADC measurement.

            If property is not found default value depending on chip will be used.

        allOf:

          - $ref: /schemas/types.yaml#/definitions/uint32-array

        $ref: /schemas/types.yaml#/definitions/uint32-array

        oneOf:

          - items:

              - const: 1

Documentation/devicetree/bindings/interrupt-controller/mti,gic.yaml

+13 −15
Original line number Diff line number Diff line
@@ -42,9 +42,8 @@ properties: 
      Specifies the list of CPU interrupt vectors to which the GIC may not

      route interrupts. This property is ignored if the CPU is started in EIC

      mode.

    allOf:

      - $ref: /schemas/types.yaml#definitions/uint32-array

      - minItems: 1

    $ref: /schemas/types.yaml#definitions/uint32-array

    minItems: 1

    maxItems: 6

    uniqueItems: true

    items:
@@ -57,9 +56,8 @@ properties: 
      It accepts two values: the 1st is the starting interrupt and the 2nd is

      the size of the reserved range. If not specified, the driver will

      allocate the last (2 * number of VPEs in the system).

    allOf:

      - $ref: /schemas/types.yaml#definitions/uint32-array

      - items:

    $ref: /schemas/types.yaml#definitions/uint32-array

    items:

      - minimum: 0

        maximum: 254

      - minimum: 2

Documentation/devicetree/bindings/media/i2c/dongwoon,dw9768.yaml

+20 −23
Original line number Diff line number Diff line
@@ -38,9 +38,8 @@ properties: 
  dongwoon,aac-mode:

    description:

      Indication of AAC mode select.

    allOf:

      - $ref: "/schemas/types.yaml#/definitions/uint32"

      - enum:

    $ref: "/schemas/types.yaml#/definitions/uint32"

    enum:

      - 1    #  AAC2 mode(operation time# 0.48 x Tvib)

      - 2    #  AAC3 mode(operation time# 0.70 x Tvib)

      - 3    #  AAC4 mode(operation time# 0.75 x Tvib)
@@ -51,9 +50,8 @@ properties: 
    description:

      Number of AAC Timing count that controlled by one 6-bit period of

      vibration register AACT[5:0], the unit of which is 100 us.

    allOf:

      - $ref: "/schemas/types.yaml#/definitions/uint32"

      - default: 0x20

    $ref: "/schemas/types.yaml#/definitions/uint32"

    default: 0x20

    minimum: 0x00

    maximum: 0x3f
@@ -61,9 +59,8 @@ properties: 
    description:

      Indication of VCM internal clock dividing rate select, as one multiple

      factor to calculate VCM ring periodic time Tvib.

    allOf:

      - $ref: "/schemas/types.yaml#/definitions/uint32"

      - enum:

    $ref: "/schemas/types.yaml#/definitions/uint32"

    enum:

      - 0    #  Dividing Rate -  2

      - 1    #  Dividing Rate -  1

      - 2    #  Dividing Rate -  1/2

Documentation/devicetree/bindings/pci/ti,j721e-pci-ep.yaml

+1 −2
Original line number Diff line number Diff line
@@ -31,8 +31,7 @@ properties: 
  ti,syscon-pcie-ctrl:

    description: Phandle to the SYSCON entry required for configuring PCIe mode

                 and link speed.

    allOf:

      - $ref: /schemas/types.yaml#/definitions/phandle

    $ref: /schemas/types.yaml#/definitions/phandle



  power-domains:

    maxItems: 1

CRA Git | Maintained and supported by SUSTech CRA and CCSE