Commit 12c2f77b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'tty-6.4-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/serial driver fixes for 6.4-rc5 that have all
  been in linux-next this past week with no reported problems. Included
  in here are:

   - 8250_tegra driver bugfix

   - fsl uart driver bugfixes

   - Kconfig fix for dependancy issue

   - dt-bindings fix for the 8250_omap driver"

* tag 'tty-6.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  dt-bindings: serial: 8250_omap: add rs485-rts-active-high
  serial: cpm_uart: Fix a COMPILE_TEST dependency
  soc: fsl: cpm1: Fix TSA and QMC dependencies in case of COMPILE_TEST
  tty: serial: fsl_lpuart: use UARTCTRL_TXINV to send break instead of UARTCTRL_SBK
  serial: 8250_tegra: Fix an error handling path in tegra_uart_probe()
parents 8b435e40 403e97d6

Documentation/devicetree/bindings/serial/8250_omap.yaml

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ properties: 
  dsr-gpios: true

  rng-gpios: true

  dcd-gpios: true

  rs485-rts-active-high: true

  rts-gpio: true

  power-domains: true

  clock-frequency: true

drivers/soc/fsl/qe/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ config UCC 
config CPM_TSA

	tristate "CPM TSA support"

	depends on OF && HAS_IOMEM

	depends on CPM1 || COMPILE_TEST

	depends on CPM1 || (CPM && COMPILE_TEST)

	help

	  Freescale CPM Time Slot Assigner (TSA)

	  controller.
@@ -47,7 +47,7 @@ config CPM_TSA 
config CPM_QMC

	tristate "CPM QMC support"

	depends on OF && HAS_IOMEM

	depends on CPM1 || (FSL_SOC && COMPILE_TEST)

	depends on CPM1 || (FSL_SOC && CPM && COMPILE_TEST)

	depends on CPM_TSA

	help

	  Freescale CPM QUICC Multichannel Controller

drivers/tty/serial/8250/8250_tegra.c

+3 −1
Original line number Diff line number Diff line
@@ -113,13 +113,15 @@ static int tegra_uart_probe(struct platform_device *pdev) 


	ret = serial8250_register_8250_port(&port8250);

	if (ret < 0)

		goto err_clkdisable;

		goto err_ctrl_assert;



	platform_set_drvdata(pdev, uart);

	uart->line = ret;



	return 0;



err_ctrl_assert:

	reset_control_assert(uart->rst);

err_clkdisable:

	clk_disable_unprepare(uart->clk);

drivers/tty/serial/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -762,7 +762,7 @@ config SERIAL_PMACZILOG_CONSOLE 


config SERIAL_CPM

	tristate "CPM SCC/SMC serial port support"

	depends on CPM2 || CPM1 || (PPC32 && COMPILE_TEST)

	depends on CPM2 || CPM1

	select SERIAL_CORE

	help

	  This driver supports the SCC and SMC serial ports on Motorola

drivers/tty/serial/cpm_uart/cpm_uart.h

+0 −2
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ struct gpio_desc; 
#include "cpm_uart_cpm2.h"

#elif defined(CONFIG_CPM1)

#include "cpm_uart_cpm1.h"

#elif defined(CONFIG_COMPILE_TEST)

#include "cpm_uart_cpm2.h"

#endif



#define SERIAL_CPM_MAJOR	204