diff options
| author | Greg Kroah-Hartman | 2017-12-11 08:41:08 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2017-12-11 08:41:08 +0100 |
| commit | 42e64571d516ef761d9f330c80493637cbf3bdda (patch) | |
| tree | 5f3df1c06c2d571efa5fd72d0c8022a80140eec2 /Documentation/devicetree/bindings/pinctrl/pinctrl-sirf.txt | |
| parent | serial: imx: Support common rs485 binding for RTS polarity (diff) | |
| parent | Linux 4.15-rc3 (diff) | |
| download | kernel-qcow2-linux-42e64571d516ef761d9f330c80493637cbf3bdda.tar.gz kernel-qcow2-linux-42e64571d516ef761d9f330c80493637cbf3bdda.tar.xz kernel-qcow2-linux-42e64571d516ef761d9f330c80493637cbf3bdda.zip | |
Merge 4.15-rc3 into tty-next
We want the serial/tty fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/devicetree/bindings/pinctrl/pinctrl-sirf.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/pinctrl-sirf.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/pinctrl/pinctrl-sirf.txt b/Documentation/devicetree/bindings/pinctrl/pinctrl-sirf.txt index 5f55be59d914..f8420520e14b 100644 --- a/Documentation/devicetree/bindings/pinctrl/pinctrl-sirf.txt +++ b/Documentation/devicetree/bindings/pinctrl/pinctrl-sirf.txt @@ -41,7 +41,7 @@ For example, pinctrl might have subnodes like the following: For a specific board, if it wants to use uart2 without hardware flow control, it can add the following to its board-specific .dts file. -uart2: uart@0xb0070000 { +uart2: uart@b0070000 { pinctrl-names = "default"; pinctrl-0 = <&uart2_noflow_pins_a>; } |