diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2019-07-28 22:22:40 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2019-07-28 22:22:40 +0200 |
| commit | 7a30bdd99f37352b188575b27924c407c6ddff9e (patch) | |
| tree | 10ea40ab1b5211e75c33eaddb3a6b393ad6ee7ad /Documentation/devicetree/bindings/serial/st,stm32-usart.txt | |
| parent | x86/speculation/swapgs: Exclude ATOMs from speculation through SWAPGS (diff) | |
| parent | Linux 5.3-rc2 (diff) | |
| download | linux-dev-7a30bdd99f37352b188575b27924c407c6ddff9e.tar.xz linux-dev-7a30bdd99f37352b188575b27924c407c6ddff9e.zip | |
Merge branch master from git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Pick up the spectre documentation so the Grand Schemozzle can be added.
Diffstat (limited to 'Documentation/devicetree/bindings/serial/st,stm32-usart.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/serial/st,stm32-usart.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/serial/st,stm32-usart.txt b/Documentation/devicetree/bindings/serial/st,stm32-usart.txt index 9d3efed55deb..a6b19485c9dc 100644 --- a/Documentation/devicetree/bindings/serial/st,stm32-usart.txt +++ b/Documentation/devicetree/bindings/serial/st,stm32-usart.txt @@ -13,6 +13,7 @@ Required properties: - clocks: The input clock of the USART instance Optional properties: +- resets: Must contain the phandle to the reset controller. - pinctrl: The reference on the pins configuration - st,hw-flow-ctrl: bool flag to enable hardware flow control. - rs485-rts-delay, rs485-rx-during-tx, rs485-rts-active-low, |