Commit 932c2989 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

  Lots of tiny cleanups in here, the major stuff is:

   - termbit cleanups and unification by Ilpo. A much needed change that
     goes a long way to making things simpler for all of the different
     arches

   - tty documentation cleanups and movements to their own place in the
     documentation tree

   - old tty driver cleanups and fixes from Jiri to bring some existing
     drivers into the modern world

   - RS485 cleanups and unifications to make it easier for individual
     drivers to support this mode instead of having to duplicate logic
     in each driver

   - Lots of 8250 driver updates and additions

   - new device id additions

   - n_gsm continued fixes and cleanups

   - other minor serial driver updates and cleanups

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

* tag 'tty-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (166 commits)
  tty: Rework receive flow control char logic
  pcmcia: synclink_cs: Don't allow CS5-6
  serial: stm32-usart: Correct CSIZE, bits, and parity
  serial: st-asc: Sanitize CSIZE and correct PARENB for CS7
  serial: sifive: Sanitize CSIZE and c_iflag
  serial: sh-sci: Don't allow CS5-6
  serial: txx9: Don't allow CS5-6
  serial: rda-uart: Don't allow CS5-6
  serial: digicolor-usart: Don't allow CS5-6
  serial: uartlite: Fix BRKINT clearing
  serial: cpm_uart: Fix build error without CONFIG_SERIAL_CPM_CONSOLE
  serial: core: Do stop_rx in suspend path for console if console_suspend is disabled
  tty: serial: qcom-geni-serial: Remove uart frequency table. Instead, find suitable frequency with call to clk_round_rate.
  dt-bindings: serial: renesas,em-uart: Add RZ/V2M clock to access the registers
  serial: 8250_fintek: Check SER_RS485_RTS_* only with RS485
  Revert "serial: 8250_mtk: Make sure to select the right FEATURE_SEL"
  serial: msm_serial: disable interrupts in __msm_console_write()
  serial: meson: acquire port->lock in startup()
  serial: 8250_dw: Use dev_err_probe()
  serial: 8250_dw: Use devm_add_action_or_reset()
  ...
parents 4ad680f0 25e02ba6

Documentation/devicetree/bindings/serial/fsl-lpuart.yaml

+3 −1
Original line number Diff line number Diff line
@@ -23,7 +23,9 @@ properties: 
          - fsl,imx8qxp-lpuart

          - fsl,imxrt1050-lpuart

      - items:

          - const: fsl,imx8ulp-lpuart

          - enum:

              - fsl,imx93-lpuart

              - fsl,imx8ulp-lpuart

          - const: fsl,imx7ulp-lpuart

      - items:

          - enum:

Documentation/devicetree/bindings/serial/qcom,serial-geni-qcom.yaml

0 → 100644
+86 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: "http://devicetree.org/schemas/serial/qcom,serial-geni-qcom.yaml#"

$schema: "http://devicetree.org/meta-schemas/core.yaml#"



title: Qualcomm Geni based QUP UART interface



maintainers:

  - Andy Gross <agross@kernel.org>

  - Bjorn Andersson <bjorn.andersson@linaro.org>



allOf:

  - $ref: /schemas/serial/serial.yaml#



properties:

  compatible:

    enum:

      - qcom,geni-uart

      - qcom,geni-debug-uart



  clocks:

    maxItems: 1



  clock-names:

    const: se



  interconnects:

    maxItems: 2



  interconnect-names:

    items:

      - const: qup-core

      - const: qup-config



  interrupts:

    minItems: 1

    items:

      - description: UART core irq

      - description: Wakeup irq (RX GPIO)



  operating-points-v2: true



  pinctrl-0: true

  pinctrl-1: true



  pinctrl-names:

    minItems: 1

    items:

      - const: default

      - const: sleep



  power-domains:

    maxItems: 1



  reg:

    maxItems: 1



required:

  - compatible

  - clocks

  - clock-names

  - interrupts

  - reg



unevaluatedProperties: false



examples:

  - |

    #include <dt-bindings/interrupt-controller/arm-gic.h>

    #include <dt-bindings/clock/qcom,gcc-sc7180.h>

    #include <dt-bindings/interconnect/qcom,sc7180.h>



    serial@a88000 {

        compatible = "qcom,geni-uart";

        reg = <0xa88000 0x7000>;

        interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>;

        clock-names = "se";

        clocks = <&gcc GCC_QUPV3_WRAP0_S0_CLK>;

        pinctrl-0 = <&qup_uart0_default>;

        pinctrl-names = "default";

        interconnects = <&qup_virt MASTER_QUP_CORE_0 0 &qup_virt SLAVE_QUP_CORE_0 0>,

                        <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_QUP_0 0>;

        interconnect-names = "qup-core", "qup-config";

    };

...

Documentation/devicetree/bindings/serial/renesas,em-uart.yaml

+31 −6
Original line number Diff line number Diff line
@@ -9,12 +9,16 @@ title: Renesas EMMA Mobile UART Interface 
maintainers:

  - Magnus Damm <magnus.damm@gmail.com>



allOf:

  - $ref: serial.yaml#



properties:

  compatible:

    const: renesas,em-uart

    oneOf:

      - items:

          - enum:

              - renesas,r9a09g011-uart    # RZ/V2M

          - const: renesas,em-uart        # generic EMMA Mobile compatible UART



      - items:

          - const: renesas,em-uart        # generic EMMA Mobile compatible UART



  reg:

    maxItems: 1
@@ -23,10 +27,31 @@ properties: 
    maxItems: 1



  clocks:

    maxItems: 1

    minItems: 1

    items:

      - description: UART functional clock

      - description: Internal clock to access the registers



  clock-names:

    minItems: 1

    items:

      - const: sclk

      - const: pclk



allOf:

  - $ref: serial.yaml#



  - if:

      properties:

        compatible:

          contains:

            const: renesas,r9a09g011-uart

    then:

      properties:

        clocks:

          minItems: 2

        clock-names:

    const: sclk

          minItems: 2



required:

  - compatible

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

+8 −1
Original line number Diff line number Diff line
@@ -51,10 +51,16 @@ properties: 
              - renesas,hscif-r8a77980     # R-Car V3H

              - renesas,hscif-r8a77990     # R-Car E3

              - renesas,hscif-r8a77995     # R-Car D3

              - renesas,hscif-r8a779a0     # R-Car V3U

          - const: renesas,rcar-gen3-hscif # R-Car Gen3 and RZ/G2

          - const: renesas,hscif           # generic HSCIF compatible UART



      - items:

          - enum:

              - renesas,hscif-r8a779a0     # R-Car V3U

              - renesas,hscif-r8a779g0     # R-Car V4H

          - const: renesas,rcar-gen4-hscif # R-Car Gen4

          - const: renesas,hscif           # generic HSCIF compatible UART



  reg:

    maxItems: 1
@@ -113,6 +119,7 @@ if: 
        enum:

          - renesas,rcar-gen2-hscif

          - renesas,rcar-gen3-hscif

          - renesas,rcar-gen4-hscif

then:

  required:

    - resets

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

+1 −1
Original line number Diff line number Diff line
@@ -60,12 +60,12 @@ properties: 
              - renesas,scif-r8a77980     # R-Car V3H

              - renesas,scif-r8a77990     # R-Car E3

              - renesas,scif-r8a77995     # R-Car D3

              - renesas,scif-r8a779a0     # R-Car V3U

          - const: renesas,rcar-gen3-scif # R-Car Gen3 and RZ/G2

          - const: renesas,scif           # generic SCIF compatible UART



      - items:

          - enum:

              - renesas,scif-r8a779a0     # R-Car V3U

              - renesas,scif-r8a779f0     # R-Car S4-8

          - const: renesas,rcar-gen4-scif # R-Car Gen4

          - const: renesas,scif           # generic SCIF compatible UART