Skip to content

Commit

Permalink
Merge tag 'tty-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/…
Browse files Browse the repository at this point in the history
…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
  ...
  • Loading branch information
torvalds committed Nov 4, 2023
2 parents 4c7a0c9 + 64ebf87 commit 1f24458
Show file tree
Hide file tree
Showing 172 changed files with 4,055 additions and 2,326 deletions.
15 changes: 9 additions & 6 deletions Documentation/ABI/testing/sysfs-tty
Original file line number Diff line number Diff line change
Expand Up @@ -87,19 +87,22 @@ What: /sys/class/tty/ttyS<x>/close_delay
Date: October 2012
Contact: Alan Cox <[email protected]>
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.
These sysfs values expose the TIOCGSERIAL interface via
sysfs rather than via ioctls.

What: /sys/class/tty/ttyS<x>/closing_wait
Date: October 2012
Contact: Alan Cox <[email protected]>
Description:
Show the close wait time for this port in ms.
Show the close wait time for this port in centiseconds.

These sysfs values expose the TIOCGSERIAL interface via
sysfs rather than via ioctls.
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.

What: /sys/class/tty/ttyS<x>/custom_divisor
Date: October 2012
Expand Down
42 changes: 42 additions & 0 deletions Documentation/devicetree/bindings/serial/esp,esp32-acm.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# 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 <[email protected]>

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>;
};
51 changes: 51 additions & 0 deletions Documentation/devicetree/bindings/serial/esp,esp32-uart.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# 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 <[email protected]>

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>;
};
2 changes: 2 additions & 0 deletions Documentation/devicetree/bindings/serial/fsl-imx-uart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ properties:
interrupts:
maxItems: 1

wakeup-source: true

fsl,dte-mode:
$ref: /schemas/types.yaml#/definitions/flag
description: |
Expand Down
13 changes: 8 additions & 5 deletions Documentation/devicetree/bindings/serial/fsl-mxs-auart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,13 @@ allOf:

properties:
compatible:
enum:
- fsl,imx23-auart
- fsl,imx28-auart
- alphascale,asm9260-auart
oneOf:
- const: fsl,imx23-auart
- const: alphascale,asm9260-auart
- items:
- enum:
- fsl,imx28-auart
- const: fsl,imx23-auart

reg:
maxItems: 1
Expand Down Expand Up @@ -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>;
Expand Down
48 changes: 0 additions & 48 deletions Documentation/devicetree/bindings/serial/maxim,max310x.txt

This file was deleted.

74 changes: 74 additions & 0 deletions Documentation/devicetree/bindings/serial/maxim,max310x.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/serial/maxim,max310x.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Maxim MAX310X Advanced Universal Asynchronous Receiver-Transmitter (UART)

maintainers:
- Hugo Villeneuve <[email protected]>

properties:
compatible:
enum:
- maxim,max3107
- maxim,max3108
- maxim,max3109
- maxim,max14830

reg:
maxItems: 1

interrupts:
maxItems: 1

clocks:
maxItems: 1

clock-names:
enum:
- xtal # External crystal
- osc # External clock source

gpio-controller: true

"#gpio-cells":
const: 2

gpio-line-names:
minItems: 1
maxItems: 16

required:
- compatible
- reg
- interrupts
- clocks
- clock-names

allOf:
- $ref: /schemas/spi/spi-peripheral-props.yaml#
- $ref: /schemas/serial/serial.yaml#
- $ref: /schemas/serial/rs485.yaml#

unevaluatedProperties: false

examples:
- |
#include <dt-bindings/interrupt-controller/irq.h>
i2c {
#address-cells = <1>;
#size-cells = <0>;
serial@2c {
compatible = "maxim,max3107";
reg = <0x2c>;
clocks = <&xtal4m>;
clock-names = "xtal";
interrupt-parent = <&gpio3>;
interrupts = <7 IRQ_TYPE_LEVEL_LOW>;
gpio-controller;
#gpio-cells = <2>;
};
};
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,6 @@ properties:
- description: range upper bound
- description: adjustment (in permyriad, i.e. 0.01%)

allOf:
- $ref: serial.yaml

unevaluatedProperties: false

required:
- compatible
- reg
Expand All @@ -106,6 +101,11 @@ required:
- dmas
- dma-names

allOf:
- $ref: serial.yaml

unevaluatedProperties: false

examples:
- |
#include <dt-bindings/clock/tegra30-car.h>
Expand Down
Loading

0 comments on commit 1f24458

Please sign in to comment.