Commit dca66935 authored by Rob Herring's avatar Rob Herring
Browse files

dt-bindings: Another pass removing cases of 'allOf' containing a '$ref' 



Another pass at removing unnecessary use of 'allOf' with a '$ref'.

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.

Cc: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Guenter Roeck <groeck@chromium.org>
Cc: Richard Weinberger <richard@nod.at>
Cc: Vignesh Raghavendra <vigneshr@ti.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Kishon Vijay Abraham I <kishon@ti.com>
Cc: Sebastian Reichel <sre@kernel.org>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-By: default avatarVinod Koul <vkoul@kernel.org>
Acked-by: default avatarLee Jones <lee.jones@linaro.org>
Acked-by: default avatarMarek Behún <kabel@kernel.org>
Acked-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarJakub Kicinski <kuba@kernel.org>
Acked-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220228213802.1639658-1-robh@kernel.org
parent 53157759

Documentation/devicetree/bindings/connector/usb-connector.yaml

+1 −2
Original line number Diff line number Diff line
@@ -104,8 +104,7 @@ properties: 
      - "1.5A" and "3.0A", 5V 1.5A and 5V 3.0A respectively, as defined in USB

        Type-C Cable and Connector specification, when Power Delivery is not

        supported.

    allOf:

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

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

    enum:

      - default

      - 1.5A

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

+1 −2
Original line number Diff line number Diff line
@@ -72,8 +72,7 @@ properties: 
      - const: hpd-removed



  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/display/bridge/adi,adv7511.yaml

+2 −3
Original line number Diff line number Diff line
@@ -76,9 +76,8 @@ properties: 


  adi,input-depth:

    description: Number of bits per color component at the input.

    allOf:

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

      - enum: [ 8, 10, 12 ]

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

    enum: [ 8, 10, 12 ]



  adi,input-colorspace:

    description: Input color space.

Documentation/devicetree/bindings/display/bridge/synopsys,dw-hdmi.yaml

+2 −3
Original line number Diff line number Diff line
@@ -26,9 +26,8 @@ properties: 
  reg-io-width:

    description:

      Width (in bytes) of the registers specified by the reg property.

    allOf:

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

      - enum: [1, 4]

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

    enum: [1, 4]

    default: 1



  clocks:

Documentation/devicetree/bindings/display/panel/display-timings.yaml

+1 −2
Original line number Diff line number Diff line
@@ -31,8 +31,7 @@ properties: 
patternProperties:

  "^timing":

    type: object

    allOf:

      - $ref: panel-timing.yaml#

    $ref: panel-timing.yaml#



additionalProperties: false