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

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

Pull tty/serial driver updates from Greg KH:
 "Here are the big set of tty and serial driver changes for 5.18-rc1.

  Nothing major, some more good cleanups from Jiri and 2 new serial
  drivers. Highlights include:

   - termbits cleanups

   - export symbol cleanups and other core cleanups from Jiri Slaby

   - new sunplus and mvebu uart drivers (amazing that people are still
     creating new uarts...)

   - samsung serial driver cleanups

   - ldisc 29 is now "reserved" for experimental/development line
     disciplines

   - lots of other tiny fixes and cleanups to serial drivers and
     bindings

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

* tag 'tty-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (104 commits)
  vt_ioctl: fix potential spectre v1 in VT_DISALLOCATE
  serial: 8250: fix XOFF/XON sending when DMA is used
  tty: serial: samsung: Add ARTPEC-8 support
  dt-bindings: serial: samsung: Add ARTPEC-8 UART
  serial: sc16is7xx: Clear RS485 bits in the shutdown
  tty: serial: samsung: simplify getting OF match data
  tty: serial: samsung: constify variables and pointers
  tty: serial: samsung: constify s3c24xx_serial_drv_data members
  tty: serial: samsung: constify UART name
  tty: serial: samsung: constify s3c24xx_serial_drv_data
  tty: serial: samsung: reduce number of casts
  tty: serial: samsung: embed s3c2410_uartcfg in parent structure
  tty: serial: samsung: embed s3c24xx_uart_info in parent structure
  serial: 8250_tegra: mark acpi_device_id as unused with !ACPI
  tty: serial: bcm63xx: use more precise Kconfig symbol
  serial: SERIAL_SUNPLUS should depend on ARCH_SUNPLUS
  tty: serial: jsm: fix two assignments in if conditions
  tty: serial: jsm: remove redundant assignments to variable linestatus
  serial: 8250_mtk: make two read-only arrays static const
  serial: samsung_tty: do not unlock port->lock for uart_write_wakeup()
  ...
parents dfdc1de6 b31c4133

Documentation/devicetree/bindings/clock/marvell,armada-3700-uart-clock.yaml

0 → 100644
+59 −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/clock/marvell,armada-3700-uart-clock.yaml#

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

title: Marvell Armada 3720 UART clocks



maintainers:

  - Pali Rohár <pali@kernel.org>



properties:

  compatible:

    const: marvell,armada-3700-uart-clock



  reg:

    items:

      - description: UART Clock Control Register

      - description: UART 2 Baud Rate Divisor Register



  clocks:

    description: |

      List of parent clocks suitable for UART from following set:

        "TBG-A-P", "TBG-B-P", "TBG-A-S", "TBG-B-S", "xtal"

      UART clock can use one from this set and when more are provided

      then kernel would choose and configure the most suitable one.

      It is suggest to specify at least one TBG clock to achieve

      baudrates above 230400 and also to specify clock which bootloader

      used for UART (most probably xtal) for smooth boot log on UART.



  clock-names:

    items:

      - const: TBG-A-P

      - const: TBG-B-P

      - const: TBG-A-S

      - const: TBG-B-S

      - const: xtal

    minItems: 1



  '#clock-cells':

    const: 1



required:

  - compatible

  - reg

  - clocks

  - clock-names

  - '#clock-cells'



additionalProperties: false



examples:

  - |

    uartclk: clock-controller@12010 {

      compatible = "marvell,armada-3700-uart-clock";

      reg = <0x12010 0x4>, <0x12210 0x4>;

      clocks = <&tbg 0>, <&tbg 1>, <&tbg 2>, <&tbg 3>, <&xtalclk>;

      clock-names = "TBG-A-P", "TBG-B-P", "TBG-A-S", "TBG-B-S", "xtal";

      #clock-cells = <1>;

    };

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

+5 −5
Original line number Diff line number Diff line
@@ -20,15 +20,15 @@ properties: 
          - fsl,ls1021a-lpuart

          - fsl,ls1028a-lpuart

          - fsl,imx7ulp-lpuart

          - fsl,imx8qm-lpuart

          - fsl,imx8qxp-lpuart

          - fsl,imxrt1050-lpuart

      - items:

          - enum:

              - fsl,imx8qxp-lpuart

              - fsl,imx8ulp-lpuart

          - const: fsl,imx8ulp-lpuart

          - const: fsl,imx7ulp-lpuart

      - items:

          - const: fsl,imx8qm-lpuart

          - enum:

              - fsl,imx8qm-lpuart

              - fsl,imx8dxl-lpuart

          - const: fsl,imx8qxp-lpuart



  reg:

Documentation/devicetree/bindings/serial/mtk-uart.txt

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ Required properties: 
  * "mediatek,mt8135-uart" for MT8135 compatible UARTS

  * "mediatek,mt8173-uart" for MT8173 compatible UARTS

  * "mediatek,mt8183-uart", "mediatek,mt6577-uart" for MT8183 compatible UARTS

  * "mediatek,mt8186-uart", "mediatek,mt6577-uart" for MT8183 compatible UARTS

  * "mediatek,mt8192-uart", "mediatek,mt6577-uart" for MT8192 compatible UARTS

  * "mediatek,mt8195-uart", "mediatek,mt6577-uart" for MT8195 compatible UARTS

  * "mediatek,mt8516-uart" for MT8516 compatible UARTS

Documentation/devicetree/bindings/serial/mvebu-uart.txt

+6 −3
Original line number Diff line number Diff line
@@ -14,7 +14,10 @@ Required properties: 
      is provided (possible only with the "marvell,armada-3700-uart"

      compatible string for backward compatibility), it will only work

      if the baudrate was initialized by the bootloader and no baudrate

      change will then be possible.

      change will then be possible. When provided it should be UART1-clk

      for standard variant of UART and UART2-clk for extended variant

      of UART. TBG clock (with UART TBG divisors d1=d2=1) or xtal clock

      should not be used and are supported only for backward compatibility.

- interrupts:

    - Must contain three elements for the standard variant of the IP

      (marvell,armada-3700-uart): "uart-sum", "uart-tx" and "uart-rx",
@@ -34,7 +37,7 @@ Example: 
	uart0: serial@12000 {

		compatible = "marvell,armada-3700-uart";

		reg = <0x12000 0x18>;

		clocks = <&xtalclk>;

		clocks = <&uartclk 0>;

		interrupts =

		<GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>,

		<GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>,
@@ -45,7 +48,7 @@ Example: 
	uart1: serial@12200 {

		compatible = "marvell,armada-3700-uart-ext";

		reg = <0x12200 0x30>;

		clocks = <&xtalclk>;

		clocks = <&uartclk 1>;

		interrupts =

		<GIC_SPI 30 IRQ_TYPE_EDGE_RISING>,

		<GIC_SPI 31 IRQ_TYPE_EDGE_RISING>;

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

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ properties: 
    oneOf:

      - items:

          - enum:

              - renesas,r9a07g043-sci     # RZ/G2UL

              - renesas,r9a07g044-sci     # RZ/G2{L,LC}

              - renesas,r9a07g054-sci     # RZ/V2L

          - const: renesas,sci            # generic SCI compatible UART
@@ -67,6 +68,7 @@ if: 
    compatible:

      contains:

        enum:

          - renesas,r9a07g043-sci

          - renesas,r9a07g044-sci

          - renesas,r9a07g054-sci

then: