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

Pull tty / serial updates from Greg KH:
 "Here is the big set of tty/serial driver updates for 6.4-rc1.

  Nothing major, just lots of tiny, constant, forward development. This
  includes:

   - obligatory n_gsm updates and feature additions

   - 8250_em driver updates

   - sh-sci driver updates

   - dts cleanups and updates

   - general cleanups and improvements by Ilpo and Jiri

   - other small serial driver core fixes and driver updates

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

* tag 'tty-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (87 commits)
  n_gsm: Use array_index_nospec() with index that comes from userspace
  tty: vt: drop checks for undefined VT_SINGLE_DRIVER
  tty: vt: distribute EXPORT_SYMBOL()
  tty: vt: simplify some cases in tioclinux()
  tty: vt: reformat tioclinux()
  tty: serial: sh-sci: Fix end of transmission on SCI
  tty: serial: sh-sci: Add support for tx end interrupt handling
  tty: serial: sh-sci: Fix TE setting on SCI IP
  tty: serial: sh-sci: Add RZ/G2L SCIFA DMA rx support
  tty: serial: sh-sci: Add RZ/G2L SCIFA DMA tx support
  serial: max310x: fix IO data corruption in batched operations
  serial: core: Disable uart_start() on uart_remove_one_port()
  serial: 8250: Reinit port->pm on port specific driver unbind
  serial: 8250: Add missing wakeup event reporting
  tty: serial: fsl_lpuart: use UARTMODIR register bits for lpuart32 platform
  tty: serial: fsl_lpuart: adjust buffer length to the intended size
  serial: fix TIOCSRS485 locking
  serial: make SiFive serial drivers depend on ARCH_ symbols
  tty: synclink_gt: don't allocate and pass dummy flags
  tty: serial: simplify qcom_geni_serial_send_chunk_fifo()
  ...

diff --combined arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
index feb27a0ccfb4d80cffe7eb64ac99e4929fdf739b,904bcd4d2acfe63a2eff227ca4be692cd0a79deb..0c49655cc90c98dfdf03bab7527e59344fecdd22
--- 1/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
--- 2/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
@@@ -1571,20 -1571,15 +1571,20 @@@
  
                        dmc: bus@38000 {
                                compatible = "simple-bus";
 -                              reg = <0x0 0x38000 0x0 0x400>;
                                #address-cells = <2>;
                                #size-cells = <2>;
 -                              ranges = <0x0 0x0 0x0 0x38000 0x0 0x400>;
 +                              ranges = <0x0 0x0 0x0 0x38000 0x0 0x2000>;
  
                                canvas: video-lut@48 {
                                        compatible = "amlogic,canvas";
                                        reg = <0x0 0x48 0x0 0x14>;
                                };
 +
 +                              pmu: pmu@80 {
 +                                      reg = <0x0 0x80 0x0 0x40>,
 +                                            <0x0 0xc00 0x0 0x40>;
 +                                      interrupts = <GIC_SPI 52 IRQ_TYPE_EDGE_RISING>;
 +                              };
                        };
  
                        usb2_phy1: phy@3a000 {
@@@ -1710,6 -1705,12 +1710,6 @@@
                        };
                };
  
 -              pmu: pmu@ff638000 {
 -                      reg = <0x0 0xff638000 0x0 0x100>,
 -                            <0x0 0xff638c00 0x0 0x100>;
 -                      interrupts = <GIC_SPI 52 IRQ_TYPE_EDGE_RISING>;
 -              };
 -
                aobus: bus@ff800000 {
                        compatible = "simple-bus";
                        reg = <0x0 0xff800000 0x0 0x100000>;
@@@ -2045,7 -2046,8 +2045,8 @@@
                        };
  
                        uart_AO: serial@3000 {
-                               compatible = "amlogic,meson-gx-uart",
+                               compatible = "amlogic,meson-g12a-uart",
+                                            "amlogic,meson-gx-uart",
                                             "amlogic,meson-ao-uart";
                                reg = <0x0 0x3000 0x0 0x18>;
                                interrupts = <GIC_SPI 193 IRQ_TYPE_EDGE_RISING>;
@@@ -2055,7 -2057,8 +2056,8 @@@
                        };
  
                        uart_AO_B: serial@4000 {
-                               compatible = "amlogic,meson-gx-uart",
+                               compatible = "amlogic,meson-g12a-uart",
+                                            "amlogic,meson-gx-uart",
                                             "amlogic,meson-ao-uart";
                                reg = <0x0 0x4000 0x0 0x18>;
                                interrupts = <GIC_SPI 197 IRQ_TYPE_EDGE_RISING>;
@@@ -2292,7 -2295,8 +2294,8 @@@
                        };
  
                        uart_C: serial@22000 {
-                               compatible = "amlogic,meson-gx-uart";
+                               compatible = "amlogic,meson-g12a-uart",
+                                            "amlogic,meson-gx-uart";
                                reg = <0x0 0x22000 0x0 0x18>;
                                interrupts = <GIC_SPI 93 IRQ_TYPE_EDGE_RISING>;
                                clocks = <&xtal>, <&clkc CLKID_UART2>, <&xtal>;
@@@ -2301,7 -2305,8 +2304,8 @@@
                        };
  
                        uart_B: serial@23000 {
-                               compatible = "amlogic,meson-gx-uart";
+                               compatible = "amlogic,meson-g12a-uart",
+                                            "amlogic,meson-gx-uart";
                                reg = <0x0 0x23000 0x0 0x18>;
                                interrupts = <GIC_SPI 75 IRQ_TYPE_EDGE_RISING>;
                                clocks = <&xtal>, <&clkc CLKID_UART1>, <&xtal>;
@@@ -2310,7 -2315,8 +2314,8 @@@
                        };
  
                        uart_A: serial@24000 {
-                               compatible = "amlogic,meson-gx-uart";
+                               compatible = "amlogic,meson-g12a-uart",
+                                            "amlogic,meson-gx-uart";
                                reg = <0x0 0x24000 0x0 0x18>;
                                interrupts = <GIC_SPI 26 IRQ_TYPE_EDGE_RISING>;
                                clocks = <&xtal>, <&clkc CLKID_UART0>, <&xtal>;