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>
This commit is contained in:
Linus Walleij 2020-01-13 22:26:29 +01:00
parent 97f7d41ff8
commit 4784adc69a
2 changed files with 7 additions and 8 deletions

View File

@ -1,7 +1,7 @@
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2 %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# $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Intel Lightning Mountain SoC pinmux & GPIO controller binding title: Intel Lightning Mountain SoC pinmux & GPIO controller binding
@ -13,10 +13,6 @@ description: |
Pinmux & GPIO controller controls pin multiplexing & configuration including Pinmux & GPIO controller controls pin multiplexing & configuration including
GPIO function selection & GPIO attributes configuration. GPIO function selection & GPIO attributes configuration.
allOf:
- $ref: pincfg-node.yaml#
- $ref: pinmux-node.yaml#
properties: properties:
compatible: compatible:
const: intel,lgm-io const: intel,lgm-io
@ -28,13 +24,16 @@ properties:
patternProperties: patternProperties:
'-pins$': '-pins$':
type: object type: object
allOf:
- $ref: pincfg-node.yaml#
- $ref: pinmux-node.yaml#
description: description:
Pinctrl node's client devices use subnodes for desired pin configuration. Pinctrl node's client devices use subnodes for desired pin configuration.
Client device subnodes use below standard properties. Client device subnodes use below standard properties.
properties: properties:
function: true function: true
group: true groups: true
pins: true pins: true
pinmux: true pinmux: true
bias-pull-up: true bias-pull-up: true
@ -46,7 +45,7 @@ patternProperties:
required: required:
- function - function
- group - groups
additionalProperties: false additionalProperties: false

View File

@ -114,7 +114,7 @@ properties:
specific binding for the hardware defines whether the entries are integers specific binding for the hardware defines whether the entries are integers
or strings, and their meaning. or strings, and their meaning.
group: groups:
$ref: /schemas/types.yaml#/definitions/string-array $ref: /schemas/types.yaml#/definitions/string-array
description: description:
the group to apply the properties to, if the driver supports the group to apply the properties to, if the driver supports