Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / Documentation / devicetree / bindings / serial / pl011.txt

diff --git a/Documentation/devicetree/bindings/serial/pl011.txt b/Documentation/devicetree/bindings/serial/pl011.txt
index 5246491..ba3ecb8 100644 (file)
--- a/Documentation/devicetree/bindings/serial/pl011.txt
+++ b/Documentation/devicetree/bindings/serial/pl011.txt
@@ -6,23 +6,35 @@ Required properties:
 - interrupts: exactly one interrupt specifier
 
 Optional properties:
-- pinctrl: When present, must have one state named "default",
+- pinctrl:
+          When present, must have one state named "default",
           and may contain a second name named "sleep". The former
           state sets up pins for ordinary operation whereas
           the latter state will put the associated pins to sleep
           when the UART is unused
-- clocks:  When present, the first clock listed must correspond to
+- clocks:
+          When present, the first clock listed must correspond to
           the clock named UARTCLK on the IP block, i.e. the clock
           to the external serial line, whereas the second clock
           must correspond to the PCLK clocking the internal logic
           of the block. Just listing one clock (the first one) is
           deprecated.
-- clocks-names: When present, the first clock listed must be named
+- clocks-names:
+          When present, the first clock listed must be named
           "uartclk" and the second clock listed must be named
           "apb_pclk"
-- dmas:           When present, may have one or two dma channels.
+- dmas:        
+          When present, may have one or two dma channels.
           The first one must be named "rx", the second one
           must be named "tx".
+- auto-poll:
+          Enables polling when using RX DMA.
+- poll-rate-ms:
+          Rate at which poll occurs when auto-poll is set,
+          default 100ms.
+- poll-timeout-ms:
+          Poll timeout when auto-poll is set, default
+          3000ms.
 
 See also bindings/arm/primecell.txt