Commit 27e4a85c authored by Rob Herring's avatar Rob Herring
Browse files

dt-bindings: Fix incomplete if/then/else schemas 



A recent review highlighted that the json-schema meta-schema allows any
combination of if/then/else schema keywords even though if, then or else
by themselves makes little sense. With an added meta-schema to only
allow valid combinations, there's a handful of schemas found which need
fixing in a variety of ways. Incorrect indentation is the most common
issue.

Cc: Lars-Peter Clausen <lars@metafoo.de>
Cc: Michael Hennerich <Michael.Hennerich@analog.com>
Cc: Jonathan Cameron <jic23@kernel.org>
Cc: Krzysztof Kozlowski <krzk+dt@kernel.org>
Cc: Olivier Moysan <olivier.moysan@foss.st.com>
Cc: Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>
Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: Georgi Djakov <djakov@kernel.org>
Cc: Ulf Hansson <ulf.hansson@linaro.org>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Jonathan Hunter <jonathanh@nvidia.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Paolo Abeni <pabeni@redhat.com>
Cc: Kishon Vijay Abraham I <kishon@ti.com>
Cc: Vinod Koul <vkoul@kernel.org>
Cc: Mark Brown <broonie@kernel.org>
Cc: Fabrice Gasnier <fabrice.gasnier@foss.st.com>
Cc: Grygorii Strashko <grygorii.strashko@ti.com>
Cc: Dmitry Osipenko <digetx@gmail.com>
Cc: linux-iio@vger.kernel.org
Cc: alsa-devel@alsa-project.org
Cc: linux-mmc@vger.kernel.org
Cc: linux-tegra@vger.kernel.org
Cc: netdev@vger.kernel.org
Cc: linux-phy@lists.infradead.org
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Acked-by: default avatarJakub Kicinski <kuba@kernel.org>
Reviewed-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20220330145741.3044896-1-robh@kernel.org
parent e7ccd8a4

Documentation/devicetree/bindings/iio/adc/adi,ad7476.yaml

+1 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ allOf: 
              - ti,adc121s

              - ti,ads7866

              - ti,ads7868

    then:

      required:

        - vcc-supply

  # Devices with a vref

Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml

+4 −4
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ patternProperties: 
              contains:

                const: st,stm32-dfsdm-adc



      - then:

        then:

          properties:

            st,adc-channels:

              minItems: 1
@@ -206,7 +206,7 @@ patternProperties: 
              contains:

                const: st,stm32-dfsdm-dmic



      - then:

        then:

          properties:

            st,adc-channels:

              maxItems: 1
@@ -254,7 +254,7 @@ allOf: 
          contains:

            const: st,stm32h7-dfsdm



  - then:

    then:

      patternProperties:

        "^filter@[0-9]+$":

          properties:
@@ -269,7 +269,7 @@ allOf: 
          contains:

            const: st,stm32mp1-dfsdm



  - then:

    then:

      patternProperties:

        "^filter@[0-9]+$":

          properties:

Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.yaml

+2 −0
Original line number Diff line number Diff line
@@ -197,6 +197,8 @@ allOf: 
              - nvidia,tegra30-sdhci

              - nvidia,tegra114-sdhci

              - nvidia,tegra124-sdhci

    then:

      properties:

        clocks:

          items:

            - description: module clock

Documentation/devicetree/bindings/net/ti,davinci-mdio.yaml

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ if: 
    compatible:

      contains:

        const: ti,davinci_mdio

then:

  required:

    - bus_freq

Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml

+17 −15
Original line number Diff line number Diff line
@@ -92,6 +92,8 @@ additionalProperties: false 
examples:

  - |

    otg: usb-controller {

      #reset-cells = <1>;



      ulpi {

        phy {

          compatible = "qcom,usb-hs-phy-msm8974", "qcom,usb-hs-phy";