Commit c0c6b5c0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull tty/serial driver fixes from Greg KH:
 "Here are some small tty and serial driver fixes for 6.9-rc5 that
  resolve a bunch of reported problems. Included in here are:

   - MAINTAINERS and .mailmap update for Richard Genoud

   - serial core regression fixes from 6.9-rc1 changes

   - pci id cleanups

   - serial core crash fix

   - stm32 driver fixes

   - 8250 driver fixes

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

* tag 'tty-6.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  serial: stm32: Reset .throttled state in .startup()
  serial: stm32: Return IRQ_NONE in the ISR if no handling happend
  serial: core: Fix missing shutdown and startup for serial base port
  serial: core: Clearing the circular buffer before NULLifying it
  MAINTAINERS: mailmap: update Richard Genoud's email address
  serial/pmac_zilog: Remove flawed mitigation for rx irq flood
  serial: 8250_pci: Remove redundant PCI IDs
  serial: core: Fix regression when runtime PM is not enabled
  serial: mxs-auart: add spinlock around changing cts state
  serial: 8250_dw: Revert: Do not reclock if already at correct rate
  serial: 8250_lpc18xx: disable clks on error in probe()
parents 5fa0ab45 ea2624b5

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -525,6 +525,7 @@ Rémi Denis-Courmont <rdenis@simphalempin.com> 
Ricardo Ribalda <ribalda@kernel.org> <ricardo@ribalda.com>

Ricardo Ribalda <ribalda@kernel.org> Ricardo Ribalda Delgado <ribalda@kernel.org>

Ricardo Ribalda <ribalda@kernel.org> <ricardo.ribalda@gmail.com>

Richard Genoud <richard.genoud@bootlin.com> <richard.genoud@gmail.com>

Richard Leitner <richard.leitner@linux.dev> <dev@g0hl1n.net>

Richard Leitner <richard.leitner@linux.dev> <me@g0hl1n.net>

Richard Leitner <richard.leitner@linux.dev> <richard.leitner@skidata.com>

Documentation/devicetree/bindings/serial/atmel,at91-usart.yaml

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Atmel Universal Synchronous Asynchronous Receiver/Transmitter (USART)



maintainers:

  - Richard Genoud <richard.genoud@gmail.com>

  - Richard Genoud <richard.genoud@bootlin.com>



properties:

  compatible:

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -14356,7 +14356,7 @@ F: drivers/dma/at_xdmac.c 
F:	include/dt-bindings/dma/at91.h









MICROCHIP AT91 SERIAL DRIVER









M:	Richard Genoud <richard.genoud@gmail.com>









M:	Richard Genoud <richard.genoud@bootlin.com>









S:	Maintained









F:	Documentation/devicetree/bindings/serial/atmel,at91-usart.yaml









F:	drivers/tty/serial/atmel_serial.c
































drivers/tty/serial/8250/8250_dw.c



+3
−3






























Original line number
Diff line number
Diff line







@@ -356,9 +356,9 @@ static void dw8250_set_termios(struct uart_port *p, struct ktermios *termios,







	long rate;









	int ret;



















	rate = clk_round_rate(d->clk, newrate);









	if (rate > 0 && p->uartclk != rate) {









	clk_disable_unprepare(d->clk);









	rate = clk_round_rate(d->clk, newrate);









	if (rate > 0) {









		/*









		 * Note that any clock-notifer worker will block in









		 * serial8250_update_uartclk() until we are done.








@@ -366,8 +366,8 @@ static void dw8250_set_termios(struct uart_port *p, struct ktermios *termios,







		ret = clk_set_rate(d->clk, newrate);









		if (!ret)









			p->uartclk = rate;









		clk_prepare_enable(d->clk);









	}









	clk_prepare_enable(d->clk);



















	dw8250_do_set_termios(p, termios, old);









}
































drivers/tty/serial/8250/8250_lpc18xx.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -151,7 +151,7 @@ static int lpc18xx_serial_probe(struct platform_device *pdev)

















	ret = uart_read_port_properties(&uart.port);









	if (ret)









		return ret;









		goto dis_uart_clk;



















	uart.port.iotype = UPIO_MEM32;









	uart.port.regshift = 2;