Merge branch 'for-4.19/cougar' into for-linus

[linux-2.6-microblaze.git] / Documentation / devicetree / bindings / mfd / stm32-timers.txt

diff --git a/Documentation/devicetree/bindings/mfd/stm32-timers.txt b/Documentation/devicetree/bindings/mfd/stm32-timers.txt
index 1db6e00..0e900b5 100644 (file)
--- a/Documentation/devicetree/bindings/mfd/stm32-timers.txt
+++ b/Documentation/devicetree/bindings/mfd/stm32-timers.txt
@@ -19,6 +19,11 @@ Required parameters:
 Optional parameters:
 - resets:              Phandle to the parent reset controller.
                        See ../reset/st,stm32-rcc.txt
+- dmas:                        List of phandle to dma channels that can be used for
+                       this timer instance. There may be up to 7 dma channels.
+- dma-names:           List of dma names. Must match 'dmas' property. Valid
+                       names are: "ch1", "ch2", "ch3", "ch4", "up", "trig",
+                       "com".
 
 Optional subnodes:
 - pwm:                 See ../pwm/pwm-stm32.txt
@@ -44,3 +49,18 @@ Example:
                        reg = <0>;
                };
        };
+
+Example with all dmas:
+       timer@40010000 {
+               ...
+               dmas = <&dmamux1 11 0x400 0x0>,
+                      <&dmamux1 12 0x400 0x0>,
+                      <&dmamux1 13 0x400 0x0>,
+                      <&dmamux1 14 0x400 0x0>,
+                      <&dmamux1 15 0x400 0x0>,
+                      <&dmamux1 16 0x400 0x0>,
+                      <&dmamux1 17 0x400 0x0>;
+               dma-names = "ch1", "ch2", "ch3", "ch4", "up", "trig", "com";
+               ...
+               child nodes...
+       };