Commit edf602a1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'tty-6.19-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 changes for 6.19-rc1. Nothing
  major at all, just small constant churn to make the tty layer
  "cleaner" as well as serial driver updates and even a new test added!
  Included in here are:

   - More tty/serial cleanups from Jiri

   - tty tiocsti test added to hopefully ensure we don't regress in this
     area again

   - sc16is7xx driver updates

   - imx serial driver updates

   - 8250 driver updates

   - new hardware device ids added

   - other minor serial/tty driver cleanups and tweaks

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

* tag 'tty-6.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (60 commits)
  serial: sh-sci: Fix deadlock during RSCI FIFO overrun error
  dt-bindings: serial: rsci: Drop "uart-has-rtscts: false"
  LoongArch: dts: Add uart new compatible string
  serial: 8250: Add Loongson uart driver support
  dt-bindings: serial: 8250: Add Loongson uart compatible
  serial: 8250: add driver for KEBA UART
  serial: Keep rs485 settings for devices without firmware node
  serial: qcom-geni: Enable Serial on SA8255p Qualcomm platforms
  serial: qcom-geni: Enable PM runtime for serial driver
  serial: sprd: Return -EPROBE_DEFER when uart clock is not ready
  tty: serial: samsung: Declare earlycon for Exynos850
  serial: icom: Convert PCIBIOS_* return codes to errnos
  serial: 8250-of: Fix style issues in 8250_of.c
  serial: add support of CPCI cards
  serial: mux: Fix kernel doc for mux_poll()
  tty: replace use of system_unbound_wq with system_dfl_wq
  serial: 8250_platform: simplify IRQF_SHARED handling
  serial: 8250: make share_irqs local to 8250_platform
  serial: 8250: move skip_txen_test to core
  serial: drop SERIAL_8250_DEPRECATED_OPTIONS
  ...
parents 83bd8929 75a9f4c5

Documentation/devicetree/bindings/serial/8250.yaml

+14 −0
Original line number Diff line number Diff line
@@ -125,6 +125,8 @@ properties: 
              - nxp,lpc1850-uart

              - opencores,uart16550-rtlsvn105

              - ti,da830-uart

              - loongson,ls2k0500-uart

              - loongson,ls2k1500-uart

          - const: ns16550a

      - items:

          - enum:
@@ -169,6 +171,18 @@ properties: 
              - nvidia,tegra194-uart

              - nvidia,tegra234-uart

          - const: nvidia,tegra20-uart

      - items:

          - enum:

              - loongson,ls2k1000-uart

          - const: loongson,ls2k0500-uart

          - const: ns16550a

      - items:

          - enum:

              - loongson,ls3a5000-uart

              - loongson,ls3a6000-uart

              - loongson,ls2k2000-uart

          - const: loongson,ls2k1500-uart

          - const: ns16550a



  reg:

    maxItems: 1

Documentation/devicetree/bindings/serial/renesas,rsci.yaml

+0 −2
Original line number Diff line number Diff line
@@ -54,8 +54,6 @@ properties: 
  power-domains:

    maxItems: 1



  uart-has-rtscts: false



required:

  - compatible

  - reg

Documentation/devicetree/bindings/serial/samsung_uart.yaml

+2 −0
Original line number Diff line number Diff line
@@ -48,7 +48,9 @@ properties: 
          - const: samsung,exynos850-uart

      - items:

          - enum:

              - axis,artpec9-uart

              - samsung,exynos7870-uart

              - samsung,exynos8890-uart

          - const: samsung,exynos8895-uart



  reg:

Documentation/devicetree/bindings/serial/snps-dw-apb-uart.yaml

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ properties: 
              - rockchip,rk3328-uart

              - rockchip,rk3368-uart

              - rockchip,rk3399-uart

              - rockchip,rk3506-uart

              - rockchip,rk3528-uart

              - rockchip,rk3562-uart

              - rockchip,rk3568-uart

arch/arm/configs/aspeed_g4_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -117,7 +117,6 @@ CONFIG_KEYBOARD_GPIO_POLLED=y 
# CONFIG_VT is not set

# CONFIG_LEGACY_PTYS is not set

CONFIG_SERIAL_8250=y

# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_NR_UARTS=6

CONFIG_SERIAL_8250_RUNTIME_UARTS=6