| Message ID | 20220706211934.567432-1-robh@kernel.org |
|---|---|
| State | Accepted |
| Commit | ae4ccaed3a063652ec5b81efec2ad57a4ee506e5 |
| Headers | show |
| Series | dt-bindings: mfd: stm32-timers: Move fixed string node names under 'properties' | expand |
On Wed, 06 Jul 2022, Rob Herring wrote: > 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 <robh@kernel.org> > --- > .../bindings/mfd/st,stm32-lptimer.yaml | 28 +++++++++---------- > .../bindings/mfd/st,stm32-timers.yaml | 20 ++++++------- > 2 files changed, 24 insertions(+), 24 deletions(-) Applied, thanks.
diff --git a/Documentation/devicetree/bindings/mfd/st,stm32-lptimer.yaml b/Documentation/devicetree/bindings/mfd/st,stm32-lptimer.yaml index ec7f0190f46e..a58f08aa430d 100644 --- a/Documentation/devicetree/bindings/mfd/st,stm32-lptimer.yaml +++ b/Documentation/devicetree/bindings/mfd/st,stm32-lptimer.yaml @@ -58,43 +58,43 @@ properties: - "#pwm-cells" - compatible -patternProperties: - "^trigger@[0-9]+$": + counter: type: object properties: compatible: - const: st,stm32-lptimer-trigger - - reg: - description: Identify trigger hardware block. - items: - minimum: 0 - maximum: 2 + const: st,stm32-lptimer-counter required: - compatible - - reg - counter: + timer: type: object properties: compatible: - const: st,stm32-lptimer-counter + const: st,stm32-lptimer-timer required: - compatible - timer: +patternProperties: + "^trigger@[0-9]+$": type: object properties: compatible: - const: st,stm32-lptimer-timer + const: st,stm32-lptimer-trigger + + reg: + description: Identify trigger hardware block. + items: + minimum: 0 + maximum: 2 required: - compatible + - reg required: - "#address-cells" diff --git a/Documentation/devicetree/bindings/mfd/st,stm32-timers.yaml b/Documentation/devicetree/bindings/mfd/st,stm32-timers.yaml index 10b330d42901..1bd663f886dc 100644 --- a/Documentation/devicetree/bindings/mfd/st,stm32-timers.yaml +++ b/Documentation/devicetree/bindings/mfd/st,stm32-timers.yaml @@ -87,6 +87,16 @@ properties: - "#pwm-cells" - compatible + counter: + type: object + + properties: + compatible: + const: st,stm32-timer-counter + + required: + - compatible + patternProperties: "^timer@[0-9]+$": type: object @@ -107,16 +117,6 @@ patternProperties: - compatible - reg - counter: - type: object - - properties: - compatible: - const: st,stm32-timer-counter - - required: - - compatible - required: - compatible - reg
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 <robh@kernel.org> --- .../bindings/mfd/st,stm32-lptimer.yaml | 28 +++++++++---------- .../bindings/mfd/st,stm32-timers.yaml | 20 ++++++------- 2 files changed, 24 insertions(+), 24 deletions(-)