From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 19 Jul 2024 22:22:14 +0000 (-0700)
Subject: Merge tag 'tty-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
X-Git-Tag: v6.11-rc1~103
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aba9753c0677e860f982edff98c7fe5a2b97758c;p=thirdparty%2Fkernel%2Flinux.git

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

Pull tty / serial updates from Greg KH:
 "Here is a small set of tty and serial driver updates for 6.11-rc1. Not
  much happened this cycle, unlike the previous kernel release which had
  lots of "excitement" in this part of the kernel. Included in here are
  the following changes:

   - dt binding updates for new platforms

   - 8250 driver updates

   - various small serial driver fixes and updates

   - printk/console naming and matching attempt #2 (was reverted for
     6.10-final, should be good to go this time around, acked by the
     relevant maintainers).

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

* tag 'tty-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (22 commits)
  Documentation: kernel-parameters: Add DEVNAME:0.0 format for serial ports
  serial: core: Add serial_base_match_and_update_preferred_console()
  printk: Add match_devname_and_update_preferred_console()
  serial: sc16is7xx: hardware reset chip if reset-gpios is defined in DT
  dt-bindings: serial: sc16is7xx: add reset-gpios
  dt-bindings: serial: vt8500-uart: convert to json-schema
  serial: 8250_platform: Explicitly show we initialise ISA ports only once
  tty: add missing MODULE_DESCRIPTION() macros
  dt-bindings: serial: mediatek,uart: add MT7988
  serial: sh-sci: Add support for RZ/V2H(P) SoC
  dt-bindings: serial: Add documentation for Renesas RZ/V2H(P) (R9A09G057) SCIF support
  dt-bindings: serial: renesas,scif: Make 'interrupt-names' property as required
  dt-bindings: serial: renesas,scif: Validate 'interrupts' and 'interrupt-names'
  dt-bindings: serial: renesas,scif: Move ref for serial.yaml at the end
  riscv: dts: starfive: jh7110: Add the core reset and jh7110 compatible for uarts
  serial: 8250_dw: Use reset array API to get resets
  dt-bindings: serial: snps-dw-apb-uart: Add one more reset signal for StarFive JH7110 SoC
  serial: 8250: Extract platform driver
  serial: 8250: Extract RSA bits
  serial: imx: stop casting struct uart_port to struct imx_port
  ...
---

aba9753c0677e860f982edff98c7fe5a2b97758c
diff --cc drivers/tty/serial/imx.c
index ff32cd2d2863a,d96f0524f7fb2..67d4a72eda770
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@@ -1549,10 -1553,9 +1554,10 @@@ static int imx_uart_startup(struct uart
  
  static void imx_uart_shutdown(struct uart_port *port)
  {
- 	struct imx_port *sport = (struct imx_port *)port;
+ 	struct imx_port *sport = to_imx_port(port);
  	unsigned long flags;
  	u32 ucr1, ucr2, ucr4, uts;
 +	int loops;
  
  	if (sport->dma_is_enabled) {
  		dmaengine_terminate_sync(sport->dma_chan_tx);
@@@ -1984,8 -1937,8 +1989,8 @@@ static void imx_uart_poll_put_char(stru
  static int imx_uart_rs485_config(struct uart_port *port, struct ktermios *termios,
  				 struct serial_rs485 *rs485conf)
  {
- 	struct imx_port *sport = (struct imx_port *)port;
+ 	struct imx_port *sport = to_imx_port(port);
 -	u32 ucr2;
 +	u32 ucr2, ufcr;
  
  	if (rs485conf->flags & SER_RS485_ENABLED) {
  		/* Enable receiver if low-active RTS signal is requested */