Commit 1f24458a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull tty and serial updates from Greg KH:
 "Here is the big set of tty/serial driver changes for 6.7-rc1. Included
  in here are:

   - console/vgacon cleanups and removals from Arnd

   - tty core and n_tty cleanups from Jiri

   - lots of 8250 driver updates and cleanups

   - sc16is7xx serial driver updates

   - dt binding updates

   - first set of port lock wrapers from Thomas for the printk fixes
     coming in future releases

   - other small serial and tty core cleanups and updates

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

* tag 'tty-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (193 commits)
  serdev: Replace custom code with device_match_acpi_handle()
  serdev: Simplify devm_serdev_device_open() function
  serdev: Make use of device_set_node()
  tty: n_gsm: add copyright Siemens Mobility GmbH
  tty: n_gsm: fix race condition in status line change on dead connections
  serial: core: Fix runtime PM handling for pending tx
  vgacon: fix mips/sibyte build regression
  dt-bindings: serial: drop unsupported samsung bindings
  tty: serial: samsung: drop earlycon support for unsupported platforms
  tty: 8250: Add note for PX-835
  tty: 8250: Fix IS-200 PCI ID comment
  tty: 8250: Add Brainboxes Oxford Semiconductor-based quirks
  tty: 8250: Add support for Intashield IX cards
  tty: 8250: Add support for additional Brainboxes PX cards
  tty: 8250: Fix up PX-803/PX-857
  tty: 8250: Fix port count of PX-257
  tty: 8250: Add support for Intashield IS-100
  tty: 8250: Add support for Brainboxes UP cards
  tty: 8250: Add support for additional Brainboxes UC cards
  tty: 8250: Remove UC-257 and UC-431
  ...
parents 4c7a0c95 64ebf879

Documentation/ABI/testing/sysfs-tty

+9 −6
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ What: /sys/class/tty/ttyS<x>/close_delay 
Date:		October 2012

Contact:	Alan Cox <alan@linux.intel.com>

Description:

		 Show the closing delay time for this port in ms.

		Show the closing delay time for this port in centiseconds.



		These sysfs values expose the TIOCGSERIAL interface via

		sysfs rather than via ioctls.
@@ -96,7 +96,10 @@ What: /sys/class/tty/ttyS<x>/closing_wait 
Date:		October 2012

Contact:	Alan Cox <alan@linux.intel.com>

Description:

		 Show the close wait time for this port in ms.

		Show the close wait time for this port in centiseconds.



		Waiting forever is represented as 0. If waiting on close is

		disabled then the value is 65535.



		These sysfs values expose the TIOCGSERIAL interface via

		sysfs rather than via ioctls.

Documentation/devicetree/bindings/serial/esp,esp32-acm.yaml

0 → 100644
+42 −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/esp,esp32-acm.yaml#

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



title: ESP32S3 ACM gadget controller



maintainers:

  - Max Filippov <jcmvbkbc@gmail.com>



description:

  Fixed function USB CDC-ACM gadget controller of the Espressif ESP32S3 SoC.



allOf:

  - $ref: serial.yaml#



properties:

  compatible:

    const: esp,esp32s3-acm



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



required:

  - compatible

  - reg

  - interrupts



additionalProperties: false



examples:

  - |

    serial@60038000 {

      compatible = "esp,esp32s3-acm";

      reg = <0x60038000 0x1000>;

      interrupts = <96 3 0>;

    };

Documentation/devicetree/bindings/serial/esp,esp32-uart.yaml

0 → 100644
+51 −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/esp,esp32-uart.yaml#

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



title: ESP32xx UART controllers



maintainers:

  - Max Filippov <jcmvbkbc@gmail.com>



description:

  ESP32 UART controller is a part of the ESP32 SoC.

  ESP32S3 UART controller is a part of the ESP32S3 SoC.

  Both SoCs are produced by Espressif Systems Co. Ltd.



allOf:

  - $ref: serial.yaml#



properties:

  compatible:

    enum:

      - esp,esp32-uart

      - esp,esp32s3-uart



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clocks:

    maxItems: 1



required:

  - compatible

  - reg

  - interrupts

  - clocks



additionalProperties: false



examples:

  - |

    serial@60000000 {

      compatible = "esp,esp32s3-uart";

      reg = <0x60000000 0x80>;

      interrupts = <27 1 0>;

      clocks = <&serial_clk>;

    };

Documentation/devicetree/bindings/serial/fsl-imx-uart.yaml

+2 −0
Original line number Diff line number Diff line
@@ -70,6 +70,8 @@ properties: 
  interrupts:

    maxItems: 1



  wakeup-source: true



  fsl,dte-mode:

    $ref: /schemas/types.yaml#/definitions/flag

    description: |

Documentation/devicetree/bindings/serial/fsl-mxs-auart.yaml

+8 −5
Original line number Diff line number Diff line
@@ -14,10 +14,13 @@ allOf: 


properties:

  compatible:

    enum:

      - fsl,imx23-auart

    oneOf:

      - const: fsl,imx23-auart

      - const: alphascale,asm9260-auart

      - items:

          - enum:

              - fsl,imx28-auart

      - alphascale,asm9260-auart

          - const: fsl,imx23-auart



  reg:

    maxItems: 1
@@ -82,7 +85,7 @@ examples: 
    };



    auart0: serial@8006a000 {

        compatible = "fsl,imx28-auart";

        compatible = "fsl,imx28-auart", "fsl,imx23-auart";

        reg = <0x8006a000 0x2000>;

        interrupts = <112>;

        dmas = <&dma_apbx 8>, <&dma_apbx 9>;