serial: pl011: Add device tree support for RX DMA polling

Add equivalent attributes to those provided in the platform data
for use when RX DMA is enabled.

Signed-off-by: Andrew Jackson <Andrew.Jackson@arm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/Documentation/devicetree/bindings/serial/pl011.txt b/Documentation/devicetree/bindings/serial/pl011.txt
index 5d2e840..0e05340 100644 (file)
--- a/Documentation/devicetree/bindings/serial/pl011.txt
+++ b/Documentation/devicetree/bindings/serial/pl011.txt
@@ -6,12 +6,17 @@ Required properties:
 - interrupts: exactly one interrupt specifier
 
 Optional properties:
-- pinctrl: When present, must have one state named "sleep"
-          and one state named "default"
-- clocks:  When present, must refer to exactly one clock named
-          "apb_pclk"
-- dmas:           When present, may have one or two dma channels.
-          The first one must be named "rx", the second one
-          must be named "tx".
+- pinctrl:             When present, must have one state named "sleep"
+                       and one state named "default"
+- clocks:              When present, must refer to exactly one clock named
+                       "apb_pclk"
+- 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

diff --cc drivers/tty/serial/amba-pl011.c
Simple merge