Skip to content

Commit ae4ccae

Browse files
robherringlag-linaro
authored andcommitted
dt-bindings: mfd: stm32-timers: Move fixed string node names under 'properties'
Fixed string node names should be under 'properties' rather than 'patternProperties'. Additionally, without beginning and end of line anchors, any prefix or suffix is allowed on the specified node name. Move the stm32 timers 'counter' and 'timer' nodes to the 'properties' section. Signed-off-by: Rob Herring <[email protected]> Reviewed-by: Krzysztof Kozlowski <[email protected]> Reviewed-by: Fabrice Gasnier <[email protected]> Signed-off-by: Lee Jones <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 596f2d3 commit ae4ccae

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

Documentation/devicetree/bindings/mfd/st,stm32-lptimer.yaml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -58,43 +58,43 @@ properties:
5858
- "#pwm-cells"
5959
- compatible
6060

61-
patternProperties:
62-
"^trigger@[0-9]+$":
61+
counter:
6362
type: object
6463

6564
properties:
6665
compatible:
67-
const: st,stm32-lptimer-trigger
68-
69-
reg:
70-
description: Identify trigger hardware block.
71-
items:
72-
minimum: 0
73-
maximum: 2
66+
const: st,stm32-lptimer-counter
7467

7568
required:
7669
- compatible
77-
- reg
7870

79-
counter:
71+
timer:
8072
type: object
8173

8274
properties:
8375
compatible:
84-
const: st,stm32-lptimer-counter
76+
const: st,stm32-lptimer-timer
8577

8678
required:
8779
- compatible
8880

89-
timer:
81+
patternProperties:
82+
"^trigger@[0-9]+$":
9083
type: object
9184

9285
properties:
9386
compatible:
94-
const: st,stm32-lptimer-timer
87+
const: st,stm32-lptimer-trigger
88+
89+
reg:
90+
description: Identify trigger hardware block.
91+
items:
92+
minimum: 0
93+
maximum: 2
9594

9695
required:
9796
- compatible
97+
- reg
9898

9999
required:
100100
- "#address-cells"

Documentation/devicetree/bindings/mfd/st,stm32-timers.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,16 @@ properties:
102102
- "#pwm-cells"
103103
- compatible
104104

105+
counter:
106+
type: object
107+
108+
properties:
109+
compatible:
110+
const: st,stm32-timer-counter
111+
112+
required:
113+
- compatible
114+
105115
patternProperties:
106116
"^timer@[0-9]+$":
107117
type: object
@@ -122,16 +132,6 @@ patternProperties:
122132
- compatible
123133
- reg
124134

125-
counter:
126-
type: object
127-
128-
properties:
129-
compatible:
130-
const: st,stm32-timer-counter
131-
132-
required:
133-
- compatible
134-
135135
required:
136136
- compatible
137137
- reg

0 commit comments

Comments
 (0)