diff options
| author | Alexandre Belloni <alexandre.belloni@bootlin.com> | 2020-10-30 19:36:55 +0100 | 
|---|---|---|
| committer | Thierry Reding <thierry.reding@gmail.com> | 2020-12-17 14:18:54 +0100 | 
| commit | cd6720ba022bae39e0b37ec12a3fc810643a779c (patch) | |
| tree | fdd6ac6b982ab774716f1c84d755771018fe030e | |
| parent | 44db5363fab8c91292ee6083493f1fd50201ed86 (diff) | |
dt-bindings: microchip: atmel,at91rm9200-tcb: Add atmel,tcb-pwm
Move the TCB pwm nodes under their parent. This removes the need for the
tc-block property as there is now a child-parent relationship between the
TC channel and the TC block.
Move the documentation to the main file.
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
| -rw-r--r-- | Documentation/devicetree/bindings/pwm/atmel-tcb-pwm.txt | 16 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/soc/microchip/atmel,at91rm9200-tcb.yaml | 34 | 
2 files changed, 33 insertions, 17 deletions
diff --git a/Documentation/devicetree/bindings/pwm/atmel-tcb-pwm.txt b/Documentation/devicetree/bindings/pwm/atmel-tcb-pwm.txt deleted file mode 100644 index 985fcc65f8c4..000000000000 --- a/Documentation/devicetree/bindings/pwm/atmel-tcb-pwm.txt +++ /dev/null @@ -1,16 +0,0 @@ -Atmel TCB PWM controller - -Required properties: -- compatible: should be "atmel,tcb-pwm" -- #pwm-cells: should be 3. See pwm.yaml in this directory for a description of -  the cells format. The only third cell flag supported by this binding is -  PWM_POLARITY_INVERTED. -- tc-block: The Timer Counter block to use as a PWM chip. - -Example: - -pwm { -	compatible = "atmel,tcb-pwm"; -	#pwm-cells = <3>; -	tc-block = <1>; -}; diff --git a/Documentation/devicetree/bindings/soc/microchip/atmel,at91rm9200-tcb.yaml b/Documentation/devicetree/bindings/soc/microchip/atmel,at91rm9200-tcb.yaml index 55fffae05dcf..597d67fba92f 100644 --- a/Documentation/devicetree/bindings/soc/microchip/atmel,at91rm9200-tcb.yaml +++ b/Documentation/devicetree/bindings/soc/microchip/atmel,at91rm9200-tcb.yaml @@ -59,6 +59,7 @@ patternProperties:          items:            - enum:                - atmel,tcb-timer +              - atmel,tcb-pwm                - microchip,tcb-capture        reg:          description: @@ -68,10 +69,35 @@ patternProperties:          minItems: 1          maxItems: 3 +    required: +      - compatible +      - reg + +  "^pwm@[0-2]$": +    description: The timer block channels that are used as PWMs. +    $ref: ../../pwm/pwm.yaml# +    type: object +    properties: +      compatible: +        const: atmel,tcb-pwm +      reg: +        description: +          TCB channel to use for this PWM. +        enum: [ 0, 1, 2 ] + +      "#pwm-cells": +        description: +          The only third cell flag supported by this binding is +          PWM_POLARITY_INVERTED. +        const: 3      required:        - compatible        - reg +      - "#pwm-cells" + +    additionalProperties: false +  allOf:    - if: @@ -158,7 +184,13 @@ examples:                          compatible = "atmel,tcb-timer";                          reg = <1>;                  }; -        }; + +                pwm@2 { +                        compatible = "atmel,tcb-pwm"; +                        reg = <2>; +                        #pwm-cells = <3>; +                }; +         };      /* TCB0 Capture with QDEC: */          timer@f800c000 {                  compatible = "atmel,at91rm9200-tcb", "simple-mfd", "syscon";  | 
