Commit 6c488fbb authored by Rob Herring's avatar Rob Herring Committed by Linus Walleij

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: default avatarRob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20230120020536.3229300-1-robh@kernel.orgSigned-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent a08cbeb1
...@@ -70,11 +70,11 @@ allOf: ...@@ -70,11 +70,11 @@ allOf:
- $ref: "pinctrl.yaml#" - $ref: "pinctrl.yaml#"
patternProperties: patternProperties:
'-[0-9]+$': 'pins$':
type: object type: object
additionalProperties: false additionalProperties: false
patternProperties: patternProperties:
'pins': '(^pins|pins?$)':
type: object type: object
additionalProperties: false additionalProperties: false
description: | description: |
...@@ -158,7 +158,7 @@ examples: ...@@ -158,7 +158,7 @@ examples:
<GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
i2c0_pins_a: i2c0-0 { i2c0_pins_a: i2c0-pins {
pins1 { pins1 {
pinmux = <MT8135_PIN_100_SDA0__FUNC_SDA0>, pinmux = <MT8135_PIN_100_SDA0__FUNC_SDA0>,
<MT8135_PIN_101_SCL0__FUNC_SCL0>; <MT8135_PIN_101_SCL0__FUNC_SCL0>;
...@@ -166,7 +166,7 @@ examples: ...@@ -166,7 +166,7 @@ examples:
}; };
}; };
i2c1_pins_a: i2c1-0 { i2c1_pins_a: i2c1-pins {
pins { pins {
pinmux = <MT8135_PIN_195_SDA1__FUNC_SDA1>, pinmux = <MT8135_PIN_195_SDA1__FUNC_SDA1>,
<MT8135_PIN_196_SCL1__FUNC_SCL1>; <MT8135_PIN_196_SCL1__FUNC_SCL1>;
...@@ -174,7 +174,7 @@ examples: ...@@ -174,7 +174,7 @@ examples:
}; };
}; };
i2c2_pins_a: i2c2-0 { i2c2_pins_a: i2c2-pins {
pins1 { pins1 {
pinmux = <MT8135_PIN_193_SDA2__FUNC_SDA2>; pinmux = <MT8135_PIN_193_SDA2__FUNC_SDA2>;
bias-pull-down; bias-pull-down;
...@@ -186,7 +186,7 @@ examples: ...@@ -186,7 +186,7 @@ examples:
}; };
}; };
i2c3_pins_a: i2c3-0 { i2c3_pins_a: i2c3-pins {
pins1 { pins1 {
pinmux = <MT8135_PIN_40_DAC_CLK__FUNC_GPIO40>, pinmux = <MT8135_PIN_40_DAC_CLK__FUNC_GPIO40>,
<MT8135_PIN_41_DAC_WS__FUNC_GPIO41>; <MT8135_PIN_41_DAC_WS__FUNC_GPIO41>;
......
...@@ -61,11 +61,11 @@ then: ...@@ -61,11 +61,11 @@ then:
- "#interrupt-cells" - "#interrupt-cells"
patternProperties: patternProperties:
'-[0-9]+$': '-pins(-[a-z]+)?$':
type: object type: object
additionalProperties: false additionalProperties: false
patternProperties: patternProperties:
'mux': '^mux(-|$)':
type: object type: object
additionalProperties: false additionalProperties: false
description: | description: |
...@@ -244,7 +244,7 @@ patternProperties: ...@@ -244,7 +244,7 @@ patternProperties:
groups: groups:
enum: [wf0_2g, wf0_5g] enum: [wf0_2g, wf0_5g]
'conf': '^conf(-|$)':
type: object type: object
additionalProperties: false additionalProperties: false
description: | description: |
...@@ -348,7 +348,7 @@ examples: ...@@ -348,7 +348,7 @@ examples:
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
pinctrl_eth_default: eth-0 { pinctrl_eth_default: eth-pins {
mux-mdio { mux-mdio {
groups = "mdc_mdio"; groups = "mdc_mdio";
function = "eth"; function = "eth";
......
...@@ -67,11 +67,11 @@ required: ...@@ -67,11 +67,11 @@ required:
- gpio-ranges - gpio-ranges
patternProperties: patternProperties:
'-[0-9]+$': '-pins(-[a-z]+)?$':
type: object type: object
additionalProperties: false additionalProperties: false
patternProperties: patternProperties:
'pins': '^pins':
type: object type: object
additionalProperties: false additionalProperties: false
description: | description: |
...@@ -210,7 +210,7 @@ examples: ...@@ -210,7 +210,7 @@ examples:
interrupts = <GIC_SPI 177 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 177 IRQ_TYPE_LEVEL_HIGH>;
#interrupt-cells = <2>; #interrupt-cells = <2>;
i2c0_pins_a: i2c-0 { i2c0_pins_a: i2c0-pins {
pins1 { pins1 {
pinmux = <PINMUX_GPIO48__FUNC_SCL5>, pinmux = <PINMUX_GPIO48__FUNC_SCL5>,
<PINMUX_GPIO49__FUNC_SDA5>; <PINMUX_GPIO49__FUNC_SDA5>;
...@@ -219,7 +219,7 @@ examples: ...@@ -219,7 +219,7 @@ examples:
}; };
}; };
i2c1_pins_a: i2c-1 { i2c1_pins_a: i2c1-pins {
pins { pins {
pinmux = <PINMUX_GPIO50__FUNC_SCL3>, pinmux = <PINMUX_GPIO50__FUNC_SCL3>,
<PINMUX_GPIO51__FUNC_SDA3>; <PINMUX_GPIO51__FUNC_SDA3>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment