From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 7 Dec 2025 02:38:19 +0000 (-0800)
Subject: Merge tag 'tty-6.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=edf602a17b03e6bca31c48f34ac8fc3341503ac1;p=thirdparty%2Fkernel%2Fstable.git

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
  ...
---

edf602a17b03e6bca31c48f34ac8fc3341503ac1
diff --cc drivers/tty/serial/8250/8250_platform.c
index fe7ec440ffa58,af16a36193bf5..86d12d2b59076
--- a/drivers/tty/serial/8250/8250_platform.c
+++ b/drivers/tty/serial/8250/8250_platform.c
@@@ -75,11 -73,8 +73,8 @@@ static void __init __serial8250_isa_ini
  
  	/* chain base port ops to support Remote Supervisor Adapter */
  	univ8250_port_ops = *univ8250_port_base_ops;
 -	univ8250_rsa_support(&univ8250_port_ops);
 +	univ8250_rsa_support(&univ8250_port_ops, univ8250_port_base_ops);
  
- 	if (share_irqs)
- 		irqflag = IRQF_SHARED;
- 
  	for (i = 0; i < ARRAY_SIZE(old_serial_port) && i < nr_uarts; i++) {
  		struct uart_8250_port *up = serial8250_get_port(i);
  		struct uart_port *port = &up->port;
diff --cc drivers/tty/serial/8250/8250_rsa.c
index 1f182f165525b,3b9c00515407b..fff9395948e33
--- a/drivers/tty/serial/8250/8250_rsa.c
+++ b/drivers/tty/serial/8250/8250_rsa.c
@@@ -209,27 -200,4 +209,3 @@@ void rsa_reset(struct uart_8250_port *u
  
  	serial_out(up, UART_RSA_FRR, 0);
  }
- 
- #ifdef CONFIG_SERIAL_8250_DEPRECATED_OPTIONS
- #ifndef MODULE
- /*
-  * Keep the old "8250" name working as well for the module options so we don't
-  * break people. We need to keep the names identical and the convenient macros
-  * will happily refuse to let us do that by failing the build with redefinition
-  * errors of global variables.  So we stick them inside a dummy function to
-  * avoid those conflicts.  The options still get parsed, and the redefined
-  * MODULE_PARAM_PREFIX lets us keep the "8250." syntax alive.
-  *
-  * This is hacky. I'm sorry.
-  */
- static void __used rsa8250_options(void)
- {
- #undef MODULE_PARAM_PREFIX
- #define MODULE_PARAM_PREFIX "8250_core."
- 
- 	__module_param_call(MODULE_PARAM_PREFIX, probe_rsa,
- 		&param_array_ops, .arr = &__param_arr_probe_rsa,
- 		0444, -1, 0);
- }
- #endif
- #endif
 -EXPORT_SYMBOL_FOR_MODULES(rsa_reset, "8250_base");