Skip to content

Commit 4784adc

Browse files
committed
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 <[email protected]> Cc: Rahul Tanwar <[email protected]> Signed-off-by: Linus Walleij <[email protected]>
1 parent 97f7d41 commit 4784adc

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
22
%YAML 1.2
33
---
4-
$id: http://devicetree.org/schemas/bindings/pinctrl/intel,lgm-io.yaml#
4+
$id: http://devicetree.org/schemas/pinctrl/intel,lgm-io.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

77
title: Intel Lightning Mountain SoC pinmux & GPIO controller binding
@@ -13,10 +13,6 @@ description: |
1313
Pinmux & GPIO controller controls pin multiplexing & configuration including
1414
GPIO function selection & GPIO attributes configuration.
1515
16-
allOf:
17-
- $ref: pincfg-node.yaml#
18-
- $ref: pinmux-node.yaml#
19-
2016
properties:
2117
compatible:
2218
const: intel,lgm-io
@@ -28,13 +24,16 @@ properties:
2824
patternProperties:
2925
'-pins$':
3026
type: object
27+
allOf:
28+
- $ref: pincfg-node.yaml#
29+
- $ref: pinmux-node.yaml#
3130
description:
3231
Pinctrl node's client devices use subnodes for desired pin configuration.
3332
Client device subnodes use below standard properties.
3433

3534
properties:
3635
function: true
37-
group: true
36+
groups: true
3837
pins: true
3938
pinmux: true
4039
bias-pull-up: true
@@ -46,7 +45,7 @@ patternProperties:
4645

4746
required:
4847
- function
49-
- group
48+
- groups
5049

5150
additionalProperties: false
5251

Documentation/devicetree/bindings/pinctrl/pinmux-node.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ properties:
114114
specific binding for the hardware defines whether the entries are integers
115115
or strings, and their meaning.
116116

117-
group:
117+
groups:
118118
$ref: /schemas/types.yaml#/definitions/string-array
119119
description:
120120
the group to apply the properties to, if the driver supports

0 commit comments

Comments
 (0)