Skip to content

Commit 6c488fb

Browse files
robherringlinusw
authored andcommitted
dt-bindings: pinctrl: mediatek: Fix child node name patterns
The child node name patterns in Mediatek pinctrl bindings don't match reality. I don't know where '-[0-9]+$' came from, but I don't see any nodes with a matching pattern. Also, patterns such as 'pins' or 'mux' are ambiguous because any prefix or suffix is allowed. If that's desired, it should be explicit. Signed-off-by: Rob Herring <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Linus Walleij <[email protected]>
1 parent a08cbeb commit 6c488fb

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

Documentation/devicetree/bindings/pinctrl/mediatek,mt65xx-pinctrl.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ allOf:
7070
- $ref: "pinctrl.yaml#"
7171

7272
patternProperties:
73-
'-[0-9]+$':
73+
'pins$':
7474
type: object
7575
additionalProperties: false
7676
patternProperties:
77-
'pins':
77+
'(^pins|pins?$)':
7878
type: object
7979
additionalProperties: false
8080
description: |
@@ -158,23 +158,23 @@ examples:
158158
<GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,
159159
<GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
160160
161-
i2c0_pins_a: i2c0-0 {
161+
i2c0_pins_a: i2c0-pins {
162162
pins1 {
163163
pinmux = <MT8135_PIN_100_SDA0__FUNC_SDA0>,
164164
<MT8135_PIN_101_SCL0__FUNC_SCL0>;
165165
bias-disable;
166166
};
167167
};
168168
169-
i2c1_pins_a: i2c1-0 {
169+
i2c1_pins_a: i2c1-pins {
170170
pins {
171171
pinmux = <MT8135_PIN_195_SDA1__FUNC_SDA1>,
172172
<MT8135_PIN_196_SCL1__FUNC_SCL1>;
173173
bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
174174
};
175175
};
176176
177-
i2c2_pins_a: i2c2-0 {
177+
i2c2_pins_a: i2c2-pins {
178178
pins1 {
179179
pinmux = <MT8135_PIN_193_SDA2__FUNC_SDA2>;
180180
bias-pull-down;
@@ -186,7 +186,7 @@ examples:
186186
};
187187
};
188188
189-
i2c3_pins_a: i2c3-0 {
189+
i2c3_pins_a: i2c3-pins {
190190
pins1 {
191191
pinmux = <MT8135_PIN_40_DAC_CLK__FUNC_GPIO40>,
192192
<MT8135_PIN_41_DAC_WS__FUNC_GPIO41>;

Documentation/devicetree/bindings/pinctrl/mediatek,mt7622-pinctrl.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ then:
6161
- "#interrupt-cells"
6262

6363
patternProperties:
64-
'-[0-9]+$':
64+
'-pins(-[a-z]+)?$':
6565
type: object
6666
additionalProperties: false
6767
patternProperties:
68-
'mux':
68+
'^mux(-|$)':
6969
type: object
7070
additionalProperties: false
7171
description: |
@@ -244,7 +244,7 @@ patternProperties:
244244
groups:
245245
enum: [wf0_2g, wf0_5g]
246246

247-
'conf':
247+
'^conf(-|$)':
248248
type: object
249249
additionalProperties: false
250250
description: |
@@ -348,7 +348,7 @@ examples:
348348
gpio-controller;
349349
#gpio-cells = <2>;
350350
351-
pinctrl_eth_default: eth-0 {
351+
pinctrl_eth_default: eth-pins {
352352
mux-mdio {
353353
groups = "mdc_mdio";
354354
function = "eth";

Documentation/devicetree/bindings/pinctrl/mediatek,mt8183-pinctrl.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ required:
6767
- gpio-ranges
6868

6969
patternProperties:
70-
'-[0-9]+$':
70+
'-pins(-[a-z]+)?$':
7171
type: object
7272
additionalProperties: false
7373
patternProperties:
74-
'pins':
74+
'^pins':
7575
type: object
7676
additionalProperties: false
7777
description: |
@@ -210,7 +210,7 @@ examples:
210210
interrupts = <GIC_SPI 177 IRQ_TYPE_LEVEL_HIGH>;
211211
#interrupt-cells = <2>;
212212
213-
i2c0_pins_a: i2c-0 {
213+
i2c0_pins_a: i2c0-pins {
214214
pins1 {
215215
pinmux = <PINMUX_GPIO48__FUNC_SCL5>,
216216
<PINMUX_GPIO49__FUNC_SDA5>;
@@ -219,7 +219,7 @@ examples:
219219
};
220220
};
221221
222-
i2c1_pins_a: i2c-1 {
222+
i2c1_pins_a: i2c1-pins {
223223
pins {
224224
pinmux = <PINMUX_GPIO50__FUNC_SCL3>,
225225
<PINMUX_GPIO51__FUNC_SDA3>;

0 commit comments

Comments
 (0)