Commit 06367559 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Linus Walleij
Browse files

dt-bindings: pinctrl: qcom,pmic-gpio: fix matching pin config 



Matching PMIC GPIOs config nodes within a '-state' node by '.*' pattern
does not work as expected because of linux,phandle in the DTB:

  arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon-cityman.dtb: gpios@c000: divclk4-state: 'oneOf' conditional failed, one must be fixed:
    'pins' is a required property
    'function' is a required property
    'pinconf' does not match any of the regexes: 'pinctrl-[0-9]+'
    [[2]] is not of type 'object'

Make the schema stricter and expect such nodes to be either named
'pinconfig' or followed with '-pins' prefix.

Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: default avatarRob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20220507194913.261121-3-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 2313623d

Documentation/devicetree/bindings/pinctrl/qcom,pmic-gpio.yaml

+3 −2
Original line number Diff line number Diff line
@@ -96,8 +96,9 @@ patternProperties: 
    oneOf:

      - $ref: "#/$defs/qcom-pmic-gpio-state"

      - patternProperties:

          ".*":

          "(pinconf|-pins)$":

            $ref: "#/$defs/qcom-pmic-gpio-state"

        additionalProperties: false



$defs:

  qcom-pmic-gpio-state:
@@ -239,7 +240,7 @@ examples: 
      #gpio-cells = <2>;



      pm8921_gpio_keys: gpio-keys-state {

        volume-keys {

        volume-keys-pins {

          pins = "gpio20", "gpio21";

          function = "normal";