Skip to content

Commit 7e807f4

Browse files
committed
dt-bindings: mfd: Fix pinctrl node name warnings
The recent addition pinctrl.yaml in commit c09acbc ("dt-bindings: pinctrl: use pinctrl.yaml") resulted in some node name warnings: Documentation/devicetree/bindings/mfd/cirrus,lochnagar.example.dt.yaml: \ lochnagar-pinctrl: $nodename:0: 'lochnagar-pinctrl' does not match '^(pinctrl|pinmux)(@[0-9a-f]+)?$' Documentation/devicetree/bindings/mfd/cirrus,madera.example.dt.yaml: \ codec@1a: $nodename:0: 'codec@1a' does not match '^(pinctrl|pinmux)(@[0-9a-f]+)?$' Documentation/devicetree/bindings/mfd/brcm,cru.example.dt.yaml: \ pin-controller@1c0: $nodename:0: 'pin-controller@1c0' does not match '^(pinctrl|pinmux)(@[0-9a-f]+)?$' Fix the node names to the preferred 'pinctrl'. For cirrus,madera, nothing from pinctrl.yaml schema is used, so just drop the reference. Fixes: c09acbc ("dt-bindings: pinctrl: use pinctrl.yaml") Cc: Rafał Miłecki <[email protected]> Signed-off-by: Rob Herring <[email protected]> Acked-by: Charles Keepax <[email protected]> Acked-by: Lee Jones <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 0c0822b commit 7e807f4

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

Documentation/devicetree/bindings/mfd/brcm,cru.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ patternProperties:
3939
'^phy@[a-f0-9]+$':
4040
$ref: ../phy/bcm-ns-usb2-phy.yaml
4141

42-
'^pin-controller@[a-f0-9]+$':
42+
'^pinctrl@[a-f0-9]+$':
4343
$ref: ../pinctrl/brcm,ns-pinmux.yaml
4444

4545
'^syscon@[a-f0-9]+$':
@@ -94,7 +94,7 @@ examples:
9494
reg = <0x180 0x4>;
9595
};
9696
97-
pin-controller@1c0 {
97+
pinctrl@1c0 {
9898
compatible = "brcm,bcm4708-pinmux";
9999
reg = <0x1c0 0x24>;
100100
reg-names = "cru_gpio_control";

Documentation/devicetree/bindings/mfd/cirrus,lochnagar.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ properties:
126126
clock-frequency:
127127
const: 12288000
128128

129-
lochnagar-pinctrl:
129+
pinctrl:
130130
type: object
131131
$ref: /schemas/pinctrl/cirrus,lochnagar.yaml#
132132

@@ -255,7 +255,7 @@ required:
255255
- reg
256256
- reset-gpios
257257
- lochnagar-clk
258-
- lochnagar-pinctrl
258+
- pinctrl
259259

260260
additionalProperties: false
261261

@@ -293,7 +293,7 @@ examples:
293293
clock-frequency = <32768>;
294294
};
295295
296-
lochnagar-pinctrl {
296+
pinctrl {
297297
compatible = "cirrus,lochnagar-pinctrl";
298298
299299
gpio-controller;

Documentation/devicetree/bindings/pinctrl/cirrus,madera.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,6 @@ properties:
107107

108108
additionalProperties: false
109109

110-
allOf:
111-
- $ref: "pinctrl.yaml#"
112-
113110
required:
114111
- pinctrl-0
115112
- pinctrl-names

0 commit comments

Comments
 (0)