Skip to contentSkip to conversation

dt-bindings: pinctrl: intel: Update to use generic bindings

PATCH In review Rahul Tanwar 3 participants 4 messages Dec 18, 2019 – Jan 13, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dt-bindings: pinctrl: intel: Update to use generic bindings

Kernel 5.5 adds generic pin mux & cfg node schema. Update pinctrl bindings for LGM to use these newly added schemas. Also, rename filename to match the compatible string.

---
 .../devicetree/bindings/pinctrl/intel,lgm-io.yaml  |  76 ++++++++++++++
 .../bindings/pinctrl/intel,lgm-pinctrl.yaml        | 116 ---------------------
 2 files changed, 76 insertions(+), 116 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/pinctrl/intel,lgm-io.yaml
 delete mode 100644 Documentation/devicetree/bindings/pinctrl/intel,lgm-pinctrl.yaml
Documentation/devicetree/bindings/pinctrl/intel,lgm-io.yaml new file +76 -0
new file mode 100644
index 000000000000..a386fb520510
@@ -0,0 +1,76 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/bindings/pinctrl/intel,lgm-io.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Intel Lightning Mountain SoC pinmux & GPIO controller binding
+
+maintainers:
+  - Rahul Tanwar <[email protected]>
+
+description: |
+  Pinmux & GPIO controller controls pin multiplexing & configuration including
+  GPIO function selection & GPIO attributes configuration.
+
+allOf:
+  - $ref: pincfg-node.yaml#
+  - $ref: pinmux-node.yaml#
+
+properties:
+  compatible:
+    const: intel,lgm-io
+
+  reg:
+    maxItems: 1
+
+# Client device subnode's properties
+patternProperties:
+  '-pins$':
+    type: object
+    description:
+      Pinctrl node's client devices use subnodes for desired pin configuration.
+      Client device subnodes use below standard properties.
+
+    properties:
+      function: true
+      group: true
+      pins: true
+      pinmux: true
+      bias-pull-up: true
+      bias-pull-down: true
+      drive-strength: true
+      slew-rate: true
+      drive-open-drain: true
+      output-enable: true
+
+    required:
+      - function
+      - group
+
+    additionalProperties: false
+
+required:
+  - compatible
+  - reg
+
+additionalProperties: false
+
+examples:
+  # Pinmux controller node
+  - |
+    pinctrl: pinctrl@e2880000 {
+        compatible = "intel,lgm-io";
+        reg = <0xe2880000 0x100000>;
+
+        uart0-pins {
+             pins = <64>, /* UART_RX0 */
+                    <65>; /* UART_TX0 */
+             function = "CONSOLE_UART0";
+             pinmux = <1>,
+                      <1>;
+             groups = "CONSOLE_UART0";
+          };
+    };
+
+...
Documentation/devicetree/bindings/pinctrl/intel,lgm-pinctrl.yaml deleted +0 -116

116 lines not on this page · raw message

Signature · 1 line
2.11.0
#1 lore raw
Quoted 5 lines · Rahul Tanwar

Kernel 5.5 adds generic pin mux & cfg node schema. Update pinctrl bindings for LGM to use these newly added schemas. Also, rename filename to match the compatible string.

Thanks a lot for fixing this Rahul!

Patch applied.

Yours,
Linus Walleij

#2 lore raw
In reply to Rahul Tanwar
Quoted 5 lines · Rahul Tanwar

Kernel 5.5 adds generic pin mux & cfg node schema. Update pinctrl bindings for LGM to use these newly added schemas. Also, rename filename to match the compatible string.

Quoted 7 lines
---
 .../devicetree/bindings/pinctrl/intel,lgm-io.yaml  |  76 ++++++++++++++
 .../bindings/pinctrl/intel,lgm-pinctrl.yaml        | 116 ---------------------
 2 files changed, 76 insertions(+), 116 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/pinctrl/intel,lgm-io.yaml
 delete mode 100644 Documentation/devicetree/bindings/pinctrl/intel,lgm-pinctrl.yaml

Pretty sure I've said on multiple occasions to run 'make dt_binding_check'... Linux-next is broken by this (and others).

Documentation/devicetree/bindings/pinctrl/intel,lgm-io.yaml line 4

Quoted 10 lines
Documentation/devicetree/bindings/pinctrl/intel,lgm-io.yaml new file +4 -0
new file mode 100644
index 000000000000..a386fb520510
@@ -0,0 +1,76 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/bindings/pinctrl/intel,lgm-io.yaml#

Drop 'bindings' from the path.

Quoted 4 lines
Documentation/devicetree/bindings/pinctrl/intel,lgm-io.yaml new file +4 -0
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Intel Lightning Mountain SoC pinmux & GPIO controller binding
+

Documentation/devicetree/bindings/pinctrl/intel,lgm-io.yaml line 18

Quoted 10 lines
Documentation/devicetree/bindings/pinctrl/intel,lgm-io.yaml new file +10 -0
+maintainers:
+  - Rahul Tanwar <[email protected]>
+
+description: |
+  Pinmux & GPIO controller controls pin multiplexing & configuration including
+  GPIO function selection & GPIO attributes configuration.
+
+allOf:
+  - $ref: pincfg-node.yaml#
+  - $ref: pinmux-node.yaml#

This 'allOf' is at the wrong level...

Documentation/devicetree/bindings/pinctrl/intel,lgm-io.yaml line 30

Quoted 12 lines
Documentation/devicetree/bindings/pinctrl/intel,lgm-io.yaml new file +12 -0
+
+properties:
+  compatible:
+    const: intel,lgm-io
+
+  reg:
+    maxItems: 1
+
+# Client device subnode's properties
+patternProperties:
+  '-pins$':
+    type: object

...It should be here.

Quoted 32 lines
Documentation/devicetree/bindings/pinctrl/intel,lgm-io.yaml new file +32 -0
+    description:
+      Pinctrl node's client devices use subnodes for desired pin configuration.
+      Client device subnodes use below standard properties.
+
+    properties:
+      function: true
+      group: true
+      pins: true
+      pinmux: true
+      bias-pull-up: true
+      bias-pull-down: true
+      drive-strength: true
+      slew-rate: true
+      drive-open-drain: true
+      output-enable: true
+
+    required:
+      - function
+      - group
+
+    additionalProperties: false
+
+required:
+  - compatible
+  - reg
+
+additionalProperties: false
+
+examples:
+  # Pinmux controller node
+  - |
+    pinctrl: pinctrl@e2880000 {

Documentation/devicetree/bindings/pinctrl/intel,lgm-io.yaml line 72

Quoted 10 lines
Documentation/devicetree/bindings/pinctrl/intel,lgm-io.yaml new file +10 -0
+        compatible = "intel,lgm-io";
+        reg = <0xe2880000 0x100000>;
+
+        uart0-pins {
+             pins = <64>, /* UART_RX0 */
+                    <65>; /* UART_TX0 */
+             function = "CONSOLE_UART0";
+             pinmux = <1>,
+                      <1>;
+             groups = "CONSOLE_UART0";

'groups' is not a defined property. Should be 'group'.

Quoted 4 lines
Documentation/devicetree/bindings/pinctrl/intel,lgm-io.yaml new file +4 -0
+          };
+    };
+
+...
#3 lore raw
Quoted 3 lines · Rob Herring
Quoted 1 line

+$id: http://devicetree.org/schemas/bindings/pinctrl/intel,lgm-io.yaml#

Drop 'bindings' from the path.

I fixed this.

Quoted 5 lines

Documentation/devicetree/bindings/pinctrl/intel,lgm-io.yaml line 18

Quoted 3 lines
Documentation/devicetree/bindings/pinctrl/intel,lgm-io.yaml new file +3 -0
+allOf:
+  - $ref: pincfg-node.yaml#
+  - $ref: pinmux-node.yaml#

This 'allOf' is at the wrong level...

(...)

Quoted 6 lines

Documentation/devicetree/bindings/pinctrl/intel,lgm-io.yaml line 30

Quoted 4 lines
Documentation/devicetree/bindings/pinctrl/intel,lgm-io.yaml new file +4 -0
+# Client device subnode's properties
+patternProperties:
+  '-pins$':
+    type: object

...It should be here.

I moved this.

Quoted 3 lines

Documentation/devicetree/bindings/pinctrl/intel,lgm-io.yaml line 37

Quoted 3 lines
Documentation/devicetree/bindings/pinctrl/intel,lgm-io.yaml new file +3 -0
+    properties:
+      function: true
+      group: true

This should have both groups and group.

Quoted 4 lines
Quoted 4 lines
Documentation/devicetree/bindings/pinctrl/intel,lgm-io.yaml new file +4 -0
+      pins: true
+      pinmux: true
+      bias-pull-up: true
+      bias-pull-down: true
Quoted 8 lines

Documentation/devicetree/bindings/pinctrl/intel,lgm-io.yaml line 49

Quoted 8 lines
Documentation/devicetree/bindings/pinctrl/intel,lgm-io.yaml new file +8 -0
+      drive-strength: true
+      slew-rate: true
+      drive-open-drain: true
+      output-enable: true
+
+    required:
+      - function
+      - group

This should have groups as compulsory.

Quoted 9 lines

Documentation/devicetree/bindings/pinctrl/intel,lgm-io.yaml line 72

Quoted 7 lines
Documentation/devicetree/bindings/pinctrl/intel,lgm-io.yaml new file +7 -0
+        uart0-pins {
+             pins = <64>, /* UART_RX0 */
+                    <65>; /* UART_TX0 */
+             function = "CONSOLE_UART0";
+             pinmux = <1>,
+                      <1>;
+             groups = "CONSOLE_UART0";

'groups' is not a defined property. Should be 'group'.

Actually not in this case.

There was an error in commit 3af50e548019f6ee26d0ed4340f4ab980f884696 "dt-bindings: pinctrl: Convert generic pin mux and config properties to schema"

A function has a 1-to-many relationship to groups so it should be "groups" for the multiplexing (pluralis).

A pin config on the other hand, such as "set slewrate for all the pins in this pin group" has a 1-to-1 relationship to a group (singularis).

I am trying to fix it all up in one patch.

Yours,
Linus Walleij