summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-03-17 10:14:10 +0100
committerArnd Bergmann <arnd@arndb.de>2014-03-17 10:14:20 +0100
commit8d445234dcd5bdb05f21ced4d9928db0b60643dc (patch)
tree10f97ba7be19309a8d7814b61651cdd40f637164 /Documentation
parentc5d326c22b0e2e4f116ff62b7f857617776d571c (diff)
parentd5d5ce952a66c32abf36a6fdf2a1ba6cb8da9b93 (diff)
downloadblackbird-op-linux-8d445234dcd5bdb05f21ced4d9928db0b60643dc.tar.gz
blackbird-op-linux-8d445234dcd5bdb05f21ced4d9928db0b60643dc.zip
Merge branch 'efm32/cleanup' into next/dt
Dependency for efm32/dt branch. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/serial/atmel-usart.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/serial/atmel-usart.txt b/Documentation/devicetree/bindings/serial/atmel-usart.txt
index 9c5d19ac935c..17c1042b2df8 100644
--- a/Documentation/devicetree/bindings/serial/atmel-usart.txt
+++ b/Documentation/devicetree/bindings/serial/atmel-usart.txt
@@ -13,6 +13,8 @@ Required properties:
Optional properties:
- atmel,use-dma-rx: use of PDC or DMA for receiving data
- atmel,use-dma-tx: use of PDC or DMA for transmitting data
+- rts-gpios: specify a GPIO for RTS line. It will use specified PIO instead of the peripheral
+ function pin for the USART RTS feature. If unsure, don't specify this property.
- add dma bindings for dma transfer:
- dmas: DMA specifier, consisting of a phandle to DMA controller node,
memory peripheral interface and USART DMA channel ID, FIFO configuration.
@@ -33,6 +35,7 @@ Example:
clock-names = "usart";
atmel,use-dma-rx;
atmel,use-dma-tx;
+ rts-gpios = <&pioD 15 0>;
};
- use DMA:
OpenPOWER on IntegriCloud