diff options
author | Rob Herring <robh@kernel.org> | 2020-06-10 15:49:12 -0600 |
---|---|---|
committer | Rob Herring <robh@kernel.org> | 2020-06-11 13:50:43 -0600 |
commit | 086e9074f52f6f623e1d6d02edc3cb661bb04f4e (patch) | |
tree | b08d5a9b2e39d3f86385d980d798c703de8d5473 /Documentation/devicetree/bindings/soc/qcom/qcom,geni-se.yaml | |
parent | Merge tag 'mailbox-v5.8' of git://git.linaro.org/landing-teams/working/fujitsu/integration (diff) | |
download | linux-dev-086e9074f52f6f623e1d6d02edc3cb661bb04f4e.tar.xz linux-dev-086e9074f52f6f623e1d6d02edc3cb661bb04f4e.zip |
dt-bindings: Remove more cases of 'allOf' containing a '$ref'
Another round of 'allOf' removals that came in this cycle.
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: Rob Herring <robh@kernel.org>
Diffstat (limited to 'Documentation/devicetree/bindings/soc/qcom/qcom,geni-se.yaml')
-rw-r--r-- | Documentation/devicetree/bindings/soc/qcom/qcom,geni-se.yaml | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Documentation/devicetree/bindings/soc/qcom/qcom,geni-se.yaml b/Documentation/devicetree/bindings/soc/qcom/qcom,geni-se.yaml index dee8bb2b69fe..a2b29cc3e93b 100644 --- a/Documentation/devicetree/bindings/soc/qcom/qcom,geni-se.yaml +++ b/Documentation/devicetree/bindings/soc/qcom/qcom,geni-se.yaml @@ -100,8 +100,7 @@ patternProperties: supports up to 50MHz, up to four chip selects, programmable data path from 4 bits to 32 bits and numerous protocol variants. - allOf: - - $ref: /spi/spi-controller.yaml# + $ref: /spi/spi-controller.yaml# properties: compatible: @@ -126,8 +125,7 @@ patternProperties: "i2c@[0-9a-f]+$": type: object description: GENI serial engine based I2C controller. - allOf: - - $ref: /schemas/i2c/i2c-controller.yaml# + $ref: /schemas/i2c/i2c-controller.yaml# properties: compatible: @@ -156,8 +154,7 @@ patternProperties: "serial@[0-9a-f]+$": type: object description: GENI Serial Engine based UART Controller. - allOf: - - $ref: /schemas/serial.yaml# + $ref: /schemas/serial.yaml# properties: compatible: |