Skip to content

Commit edf602a

Browse files
committed
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 ...
2 parents 83bd892 + 75a9f4c commit edf602a

71 files changed

Lines changed: 2336 additions & 1159 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Documentation/devicetree/bindings/serial/8250.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,8 @@ properties:
125125
- nxp,lpc1850-uart
126126
- opencores,uart16550-rtlsvn105
127127
- ti,da830-uart
128+
- loongson,ls2k0500-uart
129+
- loongson,ls2k1500-uart
128130
- const: ns16550a
129131
- items:
130132
- enum:
@@ -169,6 +171,18 @@ properties:
169171
- nvidia,tegra194-uart
170172
- nvidia,tegra234-uart
171173
- const: nvidia,tegra20-uart
174+
- items:
175+
- enum:
176+
- loongson,ls2k1000-uart
177+
- const: loongson,ls2k0500-uart
178+
- const: ns16550a
179+
- items:
180+
- enum:
181+
- loongson,ls3a5000-uart
182+
- loongson,ls3a6000-uart
183+
- loongson,ls2k2000-uart
184+
- const: loongson,ls2k1500-uart
185+
- const: ns16550a
172186

173187
reg:
174188
maxItems: 1

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,6 @@ properties:
5454
power-domains:
5555
maxItems: 1
5656

57-
uart-has-rtscts: false
58-
5957
required:
6058
- compatible
6159
- reg

Documentation/devicetree/bindings/serial/samsung_uart.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ properties:
4848
- const: samsung,exynos850-uart
4949
- items:
5050
- enum:
51+
- axis,artpec9-uart
5152
- samsung,exynos7870-uart
53+
- samsung,exynos8890-uart
5254
- const: samsung,exynos8895-uart
5355

5456
reg:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ properties:
6565
- rockchip,rk3328-uart
6666
- rockchip,rk3368-uart
6767
- rockchip,rk3399-uart
68+
- rockchip,rk3506-uart
6869
- rockchip,rk3528-uart
6970
- rockchip,rk3562-uart
7071
- rockchip,rk3568-uart

arch/arm/configs/aspeed_g4_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ CONFIG_KEYBOARD_GPIO_POLLED=y
117117
# CONFIG_VT is not set
118118
# CONFIG_LEGACY_PTYS is not set
119119
CONFIG_SERIAL_8250=y
120-
# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
121120
CONFIG_SERIAL_8250_CONSOLE=y
122121
CONFIG_SERIAL_8250_NR_UARTS=6
123122
CONFIG_SERIAL_8250_RUNTIME_UARTS=6

arch/arm/configs/aspeed_g5_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ CONFIG_SERIO_RAW=y
138138
# CONFIG_VT is not set
139139
# CONFIG_LEGACY_PTYS is not set
140140
CONFIG_SERIAL_8250=y
141-
# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
142141
CONFIG_SERIAL_8250_CONSOLE=y
143142
CONFIG_SERIAL_8250_NR_UARTS=6
144143
CONFIG_SERIAL_8250_RUNTIME_UARTS=6

arch/arm/configs/hisi_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ CONFIG_NETDEVICES=y
3535
CONFIG_HIX5HD2_GMAC=y
3636
CONFIG_HIP04_ETH=y
3737
CONFIG_SERIAL_8250=y
38-
CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y
3938
CONFIG_SERIAL_8250_CONSOLE=y
4039
CONFIG_SERIAL_8250_NR_UARTS=2
4140
CONFIG_SERIAL_8250_RUNTIME_UARTS=2

arch/arm/configs/lpc18xx_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ CONFIG_KEYBOARD_GPIO_POLLED=y
9090
# CONFIG_UNIX98_PTYS is not set
9191
# CONFIG_LEGACY_PTYS is not set
9292
CONFIG_SERIAL_8250=y
93-
# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
9493
CONFIG_SERIAL_8250_CONSOLE=y
9594
CONFIG_SERIAL_OF_PLATFORM=y
9695
CONFIG_SERIAL_NONSTANDARD=y

arch/arm/configs/shmobile_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ CONFIG_INPUT_DA9063_ONKEY=y
7575
CONFIG_INPUT_ADXL34X=y
7676
# CONFIG_LEGACY_PTYS is not set
7777
CONFIG_SERIAL_8250=y
78-
# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
7978
# CONFIG_SERIAL_8250_16550A_VARIANTS is not set
8079
CONFIG_SERIAL_8250_CONSOLE=y
8180
# CONFIG_SERIAL_8250_PCI is not set

arch/loongarch/boot/dts/loongson-2k0500.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@
380380
};
381381

382382
uart0: serial@1ff40800 {
383-
compatible = "ns16550a";
383+
compatible = "loongson,ls2k0500-uart", "ns16550a";
384384
reg = <0x0 0x1ff40800 0x0 0x10>;
385385
clock-frequency = <100000000>;
386386
interrupt-parent = <&eiointc>;

0 commit comments

Comments
 (0)