| Message ID | 20220924080459.13084-26-krzysztof.kozlowski@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | pinctrl/arm64: qcom: continued - fix Qualcomm TLMM pinctrl schema warnings | expand |
On Sat, Sep 24, 2022 at 10:04:52AM +0200, Krzysztof Kozlowski wrote: > Certain pins, like SDcard related, do not have functions and such should > not be required. > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > --- > .../bindings/pinctrl/qcom,qcm2290-pinctrl.yaml | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,qcm2290-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/qcom,qcm2290-pinctrl.yaml > index 5324b61eb4f7..89453cb60c12 100644 > --- a/Documentation/devicetree/bindings/pinctrl/qcom,qcm2290-pinctrl.yaml > +++ b/Documentation/devicetree/bindings/pinctrl/qcom,qcm2290-pinctrl.yaml > @@ -60,7 +60,6 @@ patternProperties: > description: > Pinctrl node's client devices use subnodes for desired pin configuration. > Client device subnodes use below standard properties. > - $ref: "qcom,tlmm-common.yaml#/$defs/qcom-tlmm-state" > > properties: > pins: > @@ -116,6 +115,16 @@ patternProperties: > required: > - pins > > + allOf: > + - $ref: "qcom,tlmm-common.yaml#/$defs/qcom-tlmm-state" You can drop the quotes here. > + - if: > + properties: > + pins: > + pattern: "^gpio([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-6])$" > + then: > + required: > + - function > + > additionalProperties: false > > allOf: > -- > 2.34.1 > >
On Sat, 24 Sep 2022 10:04:52 +0200, Krzysztof Kozlowski wrote: > Certain pins, like SDcard related, do not have functions and such should > not be required. > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > --- > .../bindings/pinctrl/qcom,qcm2290-pinctrl.yaml | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) > Reviewed-by: Rob Herring <robh@kernel.org>
On 27/09/2022 01:15, Rob Herring wrote: >> properties: >> pins: >> @@ -116,6 +115,16 @@ patternProperties: >> required: >> - pins >> >> + allOf: >> + - $ref: "qcom,tlmm-common.yaml#/$defs/qcom-tlmm-state" > > You can drop the quotes here. > Ack. Best regards, Krzysztof
On Sat, 24 Sept 2022 at 11:07, Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> wrote: > > Certain pins, like SDcard related, do not have functions and such should > not be required. > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > --- > .../bindings/pinctrl/qcom,qcm2290-pinctrl.yaml | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,qcm2290-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/qcom,qcm2290-pinctrl.yaml > index 5324b61eb4f7..89453cb60c12 100644 > --- a/Documentation/devicetree/bindings/pinctrl/qcom,qcm2290-pinctrl.yaml > +++ b/Documentation/devicetree/bindings/pinctrl/qcom,qcm2290-pinctrl.yaml > @@ -60,7 +60,6 @@ patternProperties: > description: > Pinctrl node's client devices use subnodes for desired pin configuration. > Client device subnodes use below standard properties. > - $ref: "qcom,tlmm-common.yaml#/$defs/qcom-tlmm-state" > > properties: > pins: > @@ -116,6 +115,16 @@ patternProperties: > required: > - pins > > + allOf: Nit: I think you can drop allOf here and move the $ref up a few lines. > + - $ref: "qcom,tlmm-common.yaml#/$defs/qcom-tlmm-state" > + - if: > + properties: > + pins: > + pattern: "^gpio([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-6])$" > + then: > + required: > + - function > + > additionalProperties: false > > allOf: > -- > 2.34.1 >
On 27/09/2022 13:42, Dmitry Baryshkov wrote: > On Sat, 24 Sept 2022 at 11:07, Krzysztof Kozlowski > <krzysztof.kozlowski@linaro.org> wrote: >> >> Certain pins, like SDcard related, do not have functions and such should >> not be required. >> >> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> >> --- >> .../bindings/pinctrl/qcom,qcm2290-pinctrl.yaml | 11 ++++++++++- >> 1 file changed, 10 insertions(+), 1 deletion(-) >> >> diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,qcm2290-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/qcom,qcm2290-pinctrl.yaml >> index 5324b61eb4f7..89453cb60c12 100644 >> --- a/Documentation/devicetree/bindings/pinctrl/qcom,qcm2290-pinctrl.yaml >> +++ b/Documentation/devicetree/bindings/pinctrl/qcom,qcm2290-pinctrl.yaml >> @@ -60,7 +60,6 @@ patternProperties: >> description: >> Pinctrl node's client devices use subnodes for desired pin configuration. >> Client device subnodes use below standard properties. >> - $ref: "qcom,tlmm-common.yaml#/$defs/qcom-tlmm-state" >> >> properties: >> pins: >> @@ -116,6 +115,16 @@ patternProperties: >> required: >> - pins >> >> + allOf: > > Nit: I think you can drop allOf here and move the $ref up a few lines. > It's anyway different in v2 - there is no if:then. Best regards, Krzysztof
diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,qcm2290-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/qcom,qcm2290-pinctrl.yaml index 5324b61eb4f7..89453cb60c12 100644 --- a/Documentation/devicetree/bindings/pinctrl/qcom,qcm2290-pinctrl.yaml +++ b/Documentation/devicetree/bindings/pinctrl/qcom,qcm2290-pinctrl.yaml @@ -60,7 +60,6 @@ patternProperties: description: Pinctrl node's client devices use subnodes for desired pin configuration. Client device subnodes use below standard properties. - $ref: "qcom,tlmm-common.yaml#/$defs/qcom-tlmm-state" properties: pins: @@ -116,6 +115,16 @@ patternProperties: required: - pins + allOf: + - $ref: "qcom,tlmm-common.yaml#/$defs/qcom-tlmm-state" + - if: + properties: + pins: + pattern: "^gpio([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-6])$" + then: + required: + - function + additionalProperties: false allOf:
Certain pins, like SDcard related, do not have functions and such should not be required. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- .../bindings/pinctrl/qcom,qcm2290-pinctrl.yaml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)