| Message ID | 20221005-mdm9615-pinctrl-yaml-v1-1-0cbc006e2a30@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | arm: qcom: mdm9615: second round of bindings and DT fixes | expand |
On 06/10/2022 11:57, Neil Armstrong wrote: > Convert the MDM9515 pinctrl bindings to dt-schema. > > Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> > --- > .../bindings/pinctrl/qcom,mdm9615-pinctrl.txt | 161 --------------------- > .../bindings/pinctrl/qcom,mdm9615-pinctrl.yaml | 101 +++++++++++++ > 2 files changed, 101 insertions(+), 161 deletions(-) > Thank you for your patch. There is something to discuss/improve. > - }; > - }; > diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,mdm9615-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/qcom,mdm9615-pinctrl.yaml > new file mode 100644 > index 000000000000..6a5966fc0098 > --- /dev/null > +++ b/Documentation/devicetree/bindings/pinctrl/qcom,mdm9615-pinctrl.yaml > @@ -0,0 +1,101 @@ > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/pinctrl/qcom,mdm9615-pinctrl.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Qualcomm Technologies, Inc. MDM9615 TLMM block > + > +maintainers: > + - Bjorn Andersson <andersson@kernel.org> > + > +description: | No need for | > + This binding describes the Top Level Mode Multiplexer block found in the > + MDM9615 platform. Instead: "Top Level Mode Multiplexer pin controller node in Qualcomm MDM9615 SoC." I see this pattern is coming from other file, so I will fix all of them. > + > +allOf: > + - $ref: "pinctrl.yaml#" Drop it, it's included from tlmm-common > + - $ref: /schemas/pinctrl/qcom,tlmm-common.yaml# > + > +properties: > + compatible: > + const: qcom,mdm9615-pinctrl > + > + reg: > + maxItems: 1 > + > + interrupts: true > + interrupt-controller: true > + '#interrupt-cells': true > + gpio-controller: true > + '#gpio-cells': true > + gpio-ranges: true > + > +required: > + - compatible > + - reg > + > +additionalProperties: false > + > +patternProperties: > + '-state$': Use " as quotes > + oneOf: > + - $ref: "#/$defs/qcom-mdm9615-pinctrl-state" > + - patternProperties: > + "-pins$": > + $ref: "#/$defs/qcom-mdm9615-pinctrl-state" > + > +'$defs': No need for quotes > + qcom-mdm9615-pinctrl-state: > + type: object > + 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" No need for quotes > + > + properties: > + pins: > + description: > + List of gpio pins affected by the properties specified in this > + subnode. > + items: > + oneOf: > + - pattern: "^gpio([0-9]|[1-7][0-9]|8[0-7])$" No sd-like functions? If so, then drop oneOf > + minItems: 1 > + maxItems: 16 > + > + function: > + description: > + Specify the alternative function to be configured for the specified > + pins. > + > + enum: [ gpio, gsbi2_i2c, gsbi3, gsbi4, gsbi5_i2c, gsbi5_uart, > + sdc2, ebi2_lcdc, ps_hold, prim_audio, sec_audio, cdc_mclk, ] > + > + bias-disable: true > + bias-pull-down: true > + bias-pull-up: true > + drive-strength: true > + output-high: true > + output-low: true > + input-enable: true > + > + required: > + - pins > + - function > + > + additionalProperties: false > + > +examples: > + - | > + #include <dt-bindings/interrupt-controller/arm-gic.h> > + tlmm: pinctrl@1000000 { Use 4 spaces indentation. > + compatible = "qcom,mdm9615-pinctrl"; > + reg = <0x01000000 0x300000>; > + interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>; > + gpio-controller; > + gpio-ranges = <&msmgpio 0 0 88>; > + #gpio-cells = <2>; > + interrupt-controller; > + #interrupt-cells = <2>; Add example of -state with and without -pins node. You dropped it with conversion. > + }; > Best regards, Krzysztof
Hi, On 06/10/2022 13:09, Krzysztof Kozlowski wrote: > On 06/10/2022 11:57, Neil Armstrong wrote: >> Convert the MDM9515 pinctrl bindings to dt-schema. >> >> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> >> --- >> .../bindings/pinctrl/qcom,mdm9615-pinctrl.txt | 161 --------------------- >> .../bindings/pinctrl/qcom,mdm9615-pinctrl.yaml | 101 +++++++++++++ >> 2 files changed, 101 insertions(+), 161 deletions(-) >> > > Thank you for your patch. There is something to discuss/improve. > >> - }; >> - }; >> diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,mdm9615-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/qcom,mdm9615-pinctrl.yaml >> new file mode 100644 >> index 000000000000..6a5966fc0098 >> --- /dev/null >> +++ b/Documentation/devicetree/bindings/pinctrl/qcom,mdm9615-pinctrl.yaml >> @@ -0,0 +1,101 @@ >> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) >> +%YAML 1.2 >> +--- >> +$id: http://devicetree.org/schemas/pinctrl/qcom,mdm9615-pinctrl.yaml# >> +$schema: http://devicetree.org/meta-schemas/core.yaml# >> + >> +title: Qualcomm Technologies, Inc. MDM9615 TLMM block >> + >> +maintainers: >> + - Bjorn Andersson <andersson@kernel.org> >> + >> +description: | > > No need for | Ack > >> + This binding describes the Top Level Mode Multiplexer block found in the >> + MDM9615 platform. > > Instead: "Top Level Mode Multiplexer pin controller node in Qualcomm > MDM9615 SoC." > > I see this pattern is coming from other file, so I will fix all of them. Ack, wil use this. > >> + >> +allOf: >> + - $ref: "pinctrl.yaml#" > > Drop it, it's included from tlmm-common Ack > >> + - $ref: /schemas/pinctrl/qcom,tlmm-common.yaml# >> + >> +properties: >> + compatible: >> + const: qcom,mdm9615-pinctrl >> + >> + reg: >> + maxItems: 1 >> + >> + interrupts: true >> + interrupt-controller: true >> + '#interrupt-cells': true >> + gpio-controller: true >> + '#gpio-cells': true >> + gpio-ranges: true >> + >> +required: >> + - compatible >> + - reg >> + >> +additionalProperties: false >> + >> +patternProperties: >> + '-state$': > > Use " as quotes Ack > >> + oneOf: >> + - $ref: "#/$defs/qcom-mdm9615-pinctrl-state" >> + - patternProperties: >> + "-pins$": >> + $ref: "#/$defs/qcom-mdm9615-pinctrl-state" Interesting, if I add this subnode (that should be valid): gsbi3-state { pins = "gpio8", "gpio9", "gpio10", "gpio11"; function = "gsbi3"; drive-strength = <8>; bias-disable; }; then I get the following warning from dt_bindings_check: Documentation/devicetree/bindings/pinctrl/qcom,mdm9615-pinctrl.example.dtb: pinctrl@1000000: gsbi3-state: More than one condition true in oneOf schema: {'oneOf': [{'$ref': '#/$defs/qcom-mdm9615-pinctrl-state'}, {'patternProperties': {'-pins$': {'$ref': '#/$defs/qcom-mdm9615-pinctrl-state'}, 'pinctrl-[0-9]+': True}, 'properties': {'$nodename': True, 'phandle': True, 'pinctrl-names': True, 'secure-status': True, 'status': True}}]} From schema: /Documentation/devicetree/bindings/pinctrl/qcom,mdm9615-pinctrl.yaml And I don't understand why, the nodename should not match "-pins$" nor "pinctrl-[0-9]+'... >> + >> +'$defs': > > No need for quotes > >> + qcom-mdm9615-pinctrl-state: >> + type: object >> + 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" > > No need for quotes Ack > >> + >> + properties: >> + pins: >> + description: >> + List of gpio pins affected by the properties specified in this >> + subnode. >> + items: >> + oneOf: >> + - pattern: "^gpio([0-9]|[1-7][0-9]|8[0-7])$" > > No sd-like functions? If so, then drop oneOf Ack > >> + minItems: 1 >> + maxItems: 16 >> + >> + function: >> + description: >> + Specify the alternative function to be configured for the specified >> + pins. >> + >> + enum: [ gpio, gsbi2_i2c, gsbi3, gsbi4, gsbi5_i2c, gsbi5_uart, >> + sdc2, ebi2_lcdc, ps_hold, prim_audio, sec_audio, cdc_mclk, ] >> + >> + bias-disable: true >> + bias-pull-down: true >> + bias-pull-up: true >> + drive-strength: true >> + output-high: true >> + output-low: true >> + input-enable: true >> + >> + required: >> + - pins >> + - function >> + >> + additionalProperties: false >> + >> +examples: >> + - | >> + #include <dt-bindings/interrupt-controller/arm-gic.h> >> + tlmm: pinctrl@1000000 { > > Use 4 spaces indentation. > >> + compatible = "qcom,mdm9615-pinctrl"; >> + reg = <0x01000000 0x300000>; >> + interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>; >> + gpio-controller; >> + gpio-ranges = <&msmgpio 0 0 88>; >> + #gpio-cells = <2>; >> + interrupt-controller; >> + #interrupt-cells = <2>; > > Add example of -state with and without -pins node. > > You dropped it with conversion. Ack, done but I have a weird warning, see upper. > > >> + }; >> > > Best regards, > Krzysztof > Thanks, Neil
diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,mdm9615-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/qcom,mdm9615-pinctrl.txt deleted file mode 100644 index d46973968873..000000000000 --- a/Documentation/devicetree/bindings/pinctrl/qcom,mdm9615-pinctrl.txt +++ /dev/null @@ -1,161 +0,0 @@ -Qualcomm MDM9615 TLMM block - -This binding describes the Top Level Mode Multiplexer block found in the -MDM9615 platform. - -- compatible: - Usage: required - Value type: <string> - Definition: must be "qcom,mdm9615-pinctrl" - -- reg: - Usage: required - Value type: <prop-encoded-array> - Definition: the base address and size of the TLMM register space. - -- interrupts: - Usage: required - Value type: <prop-encoded-array> - Definition: should specify the TLMM summary IRQ. - -- interrupt-controller: - Usage: required - Value type: <none> - Definition: identifies this node as an interrupt controller - -- #interrupt-cells: - Usage: required - Value type: <u32> - Definition: must be 2. Specifying the pin number and flags, as defined - in <dt-bindings/interrupt-controller/irq.h> - -- gpio-controller: - Usage: required - Value type: <none> - Definition: identifies this node as a gpio controller - -- #gpio-cells: - Usage: required - Value type: <u32> - Definition: must be 2. Specifying the pin number and flags, as defined - in <dt-bindings/gpio/gpio.h> - -- gpio-ranges: - Usage: required - Definition: see ../gpio/gpio.txt - -- gpio-reserved-ranges: - Usage: optional - Definition: see ../gpio/gpio.txt - -Please refer to ../gpio/gpio.txt and ../interrupt-controller/interrupts.txt for -a general description of GPIO and interrupt bindings. - -Please refer to pinctrl-bindings.txt in this directory for details of the -common pinctrl bindings used by client devices, including the meaning of the -phrase "pin configuration node". - -The pin configuration nodes act as a container for an arbitrary number of -subnodes. Each of these subnodes represents some desired configuration for a -pin, a group, or a list of pins or groups. This configuration can include the -mux function to select on those pin(s)/group(s), and various pin configuration -parameters, such as pull-up, drive strength, etc. - - -PIN CONFIGURATION NODES: - -The name of each subnode is not important; all subnodes should be enumerated -and processed purely based on their content. - -Each subnode only affects those parameters that are explicitly listed. In -other words, a subnode that lists a mux function but no pin configuration -parameters implies no information about any pin configuration parameters. -Similarly, a pin subnode that describes a pullup parameter implies no -information about e.g. the mux function. - - -The following generic properties as defined in pinctrl-bindings.txt are valid -to specify in a pin configuration subnode: - -- pins: - Usage: required - Value type: <string-array> - Definition: List of gpio pins affected by the properties specified in - this subnode. Valid pins are: - gpio0-gpio87 - -- function: - Usage: required - Value type: <string> - Definition: Specify the alternative function to be configured for the - specified pins. - Valid values are: - gpio, gsbi2_i2c, gsbi3, gsbi4, gsbi5_i2c, gsbi5_uart, - sdc2, ebi2_lcdc, ps_hold, prim_audio, sec_audio, - cdc_mclk - -- bias-disable: - Usage: optional - Value type: <none> - Definition: The specified pins should be configured as no pull. - -- bias-pull-down: - Usage: optional - Value type: <none> - Definition: The specified pins should be configured as pull down. - -- bias-pull-up: - Usage: optional - Value type: <none> - Definition: The specified pins should be configured as pull up. - -- output-high: - Usage: optional - Value type: <none> - Definition: The specified pins are configured in output mode, driven - high. - -- output-low: - Usage: optional - Value type: <none> - Definition: The specified pins are configured in output mode, driven - low. - -- drive-strength: - Usage: optional - Value type: <u32> - Definition: Selects the drive strength for the specified pins, in mA. - Valid values are: 2, 4, 6, 8, 10, 12, 14 and 16 - -Example: - - msmgpio: pinctrl@800000 { - compatible = "qcom,mdm9615-pinctrl"; - reg = <0x800000 0x4000>; - - gpio-controller; - #gpio-cells = <2>; - gpio-ranges = <&msmgpio 0 0 88>; - interrupt-controller; - #interrupt-cells = <2>; - interrupts = <0 16 0x4>; - - gsbi8_uart: gsbi8-uart { - mux { - pins = "gpio34", "gpio35"; - function = "gsbi8"; - }; - - tx { - pins = "gpio34"; - drive-strength = <4>; - bias-disable; - }; - - rx { - pins = "gpio35"; - drive-strength = <2>; - bias-pull-up; - }; - }; - }; diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,mdm9615-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/qcom,mdm9615-pinctrl.yaml new file mode 100644 index 000000000000..6a5966fc0098 --- /dev/null +++ b/Documentation/devicetree/bindings/pinctrl/qcom,mdm9615-pinctrl.yaml @@ -0,0 +1,101 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/pinctrl/qcom,mdm9615-pinctrl.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm Technologies, Inc. MDM9615 TLMM block + +maintainers: + - Bjorn Andersson <andersson@kernel.org> + +description: | + This binding describes the Top Level Mode Multiplexer block found in the + MDM9615 platform. + +allOf: + - $ref: "pinctrl.yaml#" + - $ref: /schemas/pinctrl/qcom,tlmm-common.yaml# + +properties: + compatible: + const: qcom,mdm9615-pinctrl + + reg: + maxItems: 1 + + interrupts: true + interrupt-controller: true + '#interrupt-cells': true + gpio-controller: true + '#gpio-cells': true + gpio-ranges: true + +required: + - compatible + - reg + +additionalProperties: false + +patternProperties: + '-state$': + oneOf: + - $ref: "#/$defs/qcom-mdm9615-pinctrl-state" + - patternProperties: + "-pins$": + $ref: "#/$defs/qcom-mdm9615-pinctrl-state" + +'$defs': + qcom-mdm9615-pinctrl-state: + type: object + 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: + description: + List of gpio pins affected by the properties specified in this + subnode. + items: + oneOf: + - pattern: "^gpio([0-9]|[1-7][0-9]|8[0-7])$" + minItems: 1 + maxItems: 16 + + function: + description: + Specify the alternative function to be configured for the specified + pins. + + enum: [ gpio, gsbi2_i2c, gsbi3, gsbi4, gsbi5_i2c, gsbi5_uart, + sdc2, ebi2_lcdc, ps_hold, prim_audio, sec_audio, cdc_mclk, ] + + bias-disable: true + bias-pull-down: true + bias-pull-up: true + drive-strength: true + output-high: true + output-low: true + input-enable: true + + required: + - pins + - function + + additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/arm-gic.h> + tlmm: pinctrl@1000000 { + compatible = "qcom,mdm9615-pinctrl"; + reg = <0x01000000 0x300000>; + interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>; + gpio-controller; + gpio-ranges = <&msmgpio 0 0 88>; + #gpio-cells = <2>; + interrupt-controller; + #interrupt-cells = <2>; + };
Convert the MDM9515 pinctrl bindings to dt-schema. Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> --- .../bindings/pinctrl/qcom,mdm9615-pinctrl.txt | 161 --------------------- .../bindings/pinctrl/qcom,mdm9615-pinctrl.yaml | 101 +++++++++++++ 2 files changed, 101 insertions(+), 161 deletions(-)