Merge tag 'tty-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

Pull tty/serial updates from Greg KH:
 "Here is the big tty/serial driver pull request for 4.15-rc1.

  Lots of serial driver updates in here, some small vt cleanups, and a
  raft of SPDX and license boilerplate cleanups, messing up the diffstat
  a bit.

  Nothing major, with no realy functional changes except better hardware
  support for some platforms.

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'tty-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (110 commits)
  tty: ehv_bytechan: fix spelling mistake
  tty: serial: meson: allow baud-rates lower than 9600
  serial: 8250_fintek: Fix crash with baud rate B0
  serial: 8250_fintek: Disable delays for ports != 0
  serial: 8250_fintek: Return -EINVAL on invalid configuration
  tty: Remove redundant license text
  tty: serdev: Remove redundant license text
  tty: hvc: Remove redundant license text
  tty: serial: Remove redundant license text
  tty: add SPDX identifiers to all remaining files in drivers/tty/
  tty: serial: jsm: remove redundant pointer ts
  tty: serial: jsm: add space before the open parenthesis '('
  tty: serial: jsm: fix coding style
  tty: serial: jsm: delete space between function name and '('
  tty: serial: jsm: add blank line after declarations
  tty: serial: jsm: change the type of local variable
  tty: serial: imx: remove dead code imx_dma_rxint
  tty: serial: imx: disable ageing timer interrupt if dma in use
  serial: 8250: fix potential deadlock in rs485-mode
  serial: m32r_sio: Drop redundant .data assignment
  ...

1 files changed, 6 insertions, 6 deletions

diff --git a/arch/arm/boot/dts/stm32f746.dtsi b/arch/arm/boot/dts/stm32f746.dtsi
index 5633860037d2..5f9417894059 100644
--- a/arch/arm/boot/dts/stm32f746.dtsi
+++ b/arch/arm/boot/dts/stm32f746.dtsi
@@ -136,7 +136,7 @@
                 };
 
                 usart2: serial@40004400 {
-                        compatible = "st,stm32f7-usart", "st,stm32f7-uart";
+                        compatible = "st,stm32f7-uart";
                         reg = <0x40004400 0x400>;
                         interrupts = <38>;
                         clocks = <&rcc 1 CLK_USART2>;
@@ -144,7 +144,7 @@
                 };
 
                 usart3: serial@40004800 {
-                        compatible = "st,stm32f7-usart", "st,stm32f7-uart";
+                        compatible = "st,stm32f7-uart";
                         reg = <0x40004800 0x400>;
                         interrupts = <39>;
                         clocks = <&rcc 1 CLK_USART3>;
@@ -177,7 +177,7 @@
                 };
 
                 usart7: serial@40007800 {
-                        compatible = "st,stm32f7-usart", "st,stm32f7-uart";
+                        compatible = "st,stm32f7-uart";
                         reg = <0x40007800 0x400>;
                         interrupts = <82>;
                         clocks = <&rcc 1 CLK_UART7>;
@@ -185,7 +185,7 @@
                 };
 
                 usart8: serial@40007c00 {
-                        compatible = "st,stm32f7-usart", "st,stm32f7-uart";
+                        compatible = "st,stm32f7-uart";
                         reg = <0x40007c00 0x400>;
                         interrupts = <83>;
                         clocks = <&rcc 1 CLK_UART8>;
@@ -193,7 +193,7 @@
                 };
 
                 usart1: serial@40011000 {
-                        compatible = "st,stm32f7-usart", "st,stm32f7-uart";
+                        compatible = "st,stm32f7-uart";
                         reg = <0x40011000 0x400>;
                         interrupts = <37>;
                         clocks = <&rcc 1 CLK_USART1>;
@@ -201,7 +201,7 @@
                 };
 
                 usart6: serial@40011400 {
-                        compatible = "st,stm32f7-usart", "st,stm32f7-uart";
+                        compatible = "st,stm32f7-uart";
                         reg = <0x40011400 0x400>;
                         interrupts = <71>;
                         clocks = <&rcc 1 CLK_USART6>;