pinctrl: dt-bindings: Fix some errors in the lgm and pinmux schema

This fixes some problems that caused build errors in the
lgm-io schema file:

- No "bindings" infix in the schema id
- Move the allOf inclusion for pinconf and pinmux nodes into
  the patternProperties for the -pins node
- We want "groups" not "group" to be compulsory for a pinmux
  node blended with a pin config node.
- Fix the generic pinmux-schema to list "groups" rather than
  "group" for a pinmux node, this might have led to some confusion.

This is a first user of the generic schema so a bit of a bumpy
road.

Cc: Rob Herring <robh+dt@kernel.org>
Cc: Rahul Tanwar <rahul.tanwar@linux.intel.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/Documentation/devicetree/bindings/pinctrl/intel,lgm-io.yaml b/Documentation/devicetree/bindings/pinctrl/intel,lgm-io.yaml
index a386fb52051032e34749d74168c46c3589de9d81..cd2b436350ef8d23bdee56afec238f199a8274e1 100644 (file)
--- a/Documentation/devicetree/bindings/pinctrl/intel,lgm-io.yaml
+++ b/Documentation/devicetree/bindings/pinctrl/intel,lgm-io.yaml
@@ -1,7 +1,7 @@
 # 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#
+$id: http://devicetree.org/schemas/pinctrl/intel,lgm-io.yaml#
 $schema: http://devicetree.org/meta-schemas/core.yaml#
 
 title: Intel Lightning Mountain SoC pinmux & GPIO controller binding
@@ -13,10 +13,6 @@ 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
@@ -28,13 +24,16 @@ properties:
 patternProperties:
   '-pins$':
     type: object
+    allOf:
+      - $ref: pincfg-node.yaml#
+      - $ref: pinmux-node.yaml#
     description:
       Pinctrl node's client devices use subnodes for desired pin configuration.
       Client device subnodes use below standard properties.
 
     properties:
       function: true
-      group: true
+      groups: true
       pins: true
       pinmux: true
       bias-pull-up: true
@@ -46,7 +45,7 @@ patternProperties:
 
     required:
       - function
-      - group
+      - groups
 
     additionalProperties: false
 

diff --git a/Documentation/devicetree/bindings/pinctrl/pinmux-node.yaml b/Documentation/devicetree/bindings/pinctrl/pinmux-node.yaml
index 777623a57fd5595a7678f37bee2b684bef8fd19a..732d9075560bd874c336c2e352f7ec73f865d7d3 100644 (file)
--- a/Documentation/devicetree/bindings/pinctrl/pinmux-node.yaml
+++ b/Documentation/devicetree/bindings/pinctrl/pinmux-node.yaml
@@ -114,7 +114,7 @@ properties:
       specific binding for the hardware defines whether the entries are integers
       or strings, and their meaning.
 
-  group:
+  groups:
     $ref: /schemas/types.yaml#/definitions/string-array
     description:
       the group to apply the properties to, if the driver supports