Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9263a06a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull tty/serial fixes from Greg KH:
 "Here are some small tty/serial driver fixes for 4.1-rc2.

  They include some minor fixes that resolve reported issues, and a new
  device quirk.

  All have been in linux-next succesfully"

* tag 'tty-4.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  serial: 8250_pci: Add support for 16 port Exar boards
  serial: samsung: fix serial console break
  tty/serial: at91: maxburst was missing for dma transfers
  serial: of-serial: Remove device_type = "serial" registration
  serial: xilinx: Use platform_get_irq to get irq description structure
  serial: core: Fix kernel-doc build warnings
  tty: Re-add external interface for tty_set_termios()
parents dcca8de0 96a5d18b

drivers/tty/serial/8250/8250_pci.c

+23 −2
Original line number Diff line number Diff line
@@ -1998,6 +1998,8 @@ pci_wch_ch38x_setup(struct serial_private *priv, 
#define PCIE_DEVICE_ID_WCH_CH382_2S1P	0x3250

#define PCIE_DEVICE_ID_WCH_CH384_4S	0x3470



#define PCI_DEVICE_ID_EXAR_XR17V8358	0x8358



/* Unknown vendors/cards - this should not be in linux/pci_ids.h */

#define PCI_SUBDEVICE_ID_UNKNOWN_0x1584	0x1584

#define PCI_SUBDEVICE_ID_UNKNOWN_0x1588	0x1588
@@ -2520,6 +2522,13 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = { 
		.subdevice	= PCI_ANY_ID,

		.setup		= pci_xr17v35x_setup,

	},

	{

		.vendor = PCI_VENDOR_ID_EXAR,

		.device = PCI_DEVICE_ID_EXAR_XR17V8358,

		.subvendor	= PCI_ANY_ID,

		.subdevice	= PCI_ANY_ID,

		.setup		= pci_xr17v35x_setup,

	},

	/*

	 * Xircom cards

	 */
@@ -2999,6 +3008,7 @@ enum pci_board_num_t { 
	pbn_exar_XR17V352,

	pbn_exar_XR17V354,

	pbn_exar_XR17V358,

	pbn_exar_XR17V8358,

	pbn_exar_ibm_saturn,

	pbn_pasemi_1682M,

	pbn_ni8430_2,
@@ -3685,6 +3695,14 @@ static struct pciserial_board pci_boards[] = { 
		.reg_shift	= 0,

		.first_offset	= 0,

	},

	[pbn_exar_XR17V8358] = {

		.flags		= FL_BASE0,

		.num_ports	= 16,

		.base_baud	= 7812500,

		.uart_offset	= 0x400,

		.reg_shift	= 0,

		.first_offset	= 0,

	},

	[pbn_exar_ibm_saturn] = {

		.flags		= FL_BASE0,

		.num_ports	= 1,
@@ -5080,7 +5098,7 @@ static struct pci_device_id serial_pci_tbl[] = { 
		0,

		0, pbn_exar_XR17C158 },

	/*

	 * Exar Corp. XR17V35[248] Dual/Quad/Octal PCIe UARTs

	 * Exar Corp. XR17V[48]35[248] Dual/Quad/Octal/Hexa PCIe UARTs

	 */

	{	PCI_VENDOR_ID_EXAR, PCI_DEVICE_ID_EXAR_XR17V352,

		PCI_ANY_ID, PCI_ANY_ID,
@@ -5094,7 +5112,10 @@ static struct pci_device_id serial_pci_tbl[] = { 
		PCI_ANY_ID, PCI_ANY_ID,

		0,

		0, pbn_exar_XR17V358 },



	{	PCI_VENDOR_ID_EXAR, PCI_DEVICE_ID_EXAR_XR17V8358,

		PCI_ANY_ID, PCI_ANY_ID,

		0,

		0, pbn_exar_XR17V8358 },

	/*

	 * Topic TP560 Data/Fax/Voice 56k modem (reported by Evan Clarke)

	 */

drivers/tty/serial/atmel_serial.c

+2 −0
Original line number Diff line number Diff line
@@ -880,6 +880,7 @@ static int atmel_prepare_tx_dma(struct uart_port *port) 
	config.direction = DMA_MEM_TO_DEV;

	config.dst_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE;

	config.dst_addr = port->mapbase + ATMEL_US_THR;

	config.dst_maxburst = 1;



	ret = dmaengine_slave_config(atmel_port->chan_tx,

				     &config);
@@ -1059,6 +1060,7 @@ static int atmel_prepare_rx_dma(struct uart_port *port) 
	config.direction = DMA_DEV_TO_MEM;

	config.src_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE;

	config.src_addr = port->mapbase + ATMEL_US_RHR;

	config.src_maxburst = 1;



	ret = dmaengine_slave_config(atmel_port->chan_rx,

				     &config);

drivers/tty/serial/of_serial.c

+0 −1
Original line number Diff line number Diff line
@@ -346,7 +346,6 @@ static const struct of_device_id of_platform_serial_table[] = { 
	{ .compatible = "ibm,qpace-nwp-serial",

		.data = (void *)PORT_NWPSERIAL, },

#endif

	{ .type = "serial",         .data = (void *)PORT_UNKNOWN, },

	{ /* end of list */ },

};

drivers/tty/serial/samsung.c

+3 −2
Original line number Diff line number Diff line
@@ -1068,8 +1068,9 @@ static int s3c64xx_serial_startup(struct uart_port *port) 
	spin_lock_irqsave(&port->lock, flags);



	ufcon = rd_regl(port, S3C2410_UFCON);

	ufcon |= S3C2410_UFCON_RESETRX | S3C2410_UFCON_RESETTX |

			S5PV210_UFCON_RXTRIG8;

	ufcon |= S3C2410_UFCON_RESETRX | S5PV210_UFCON_RXTRIG8;

	if (!uart_console(port))

		ufcon |= S3C2410_UFCON_RESETTX;

	wr_regl(port, S3C2410_UFCON, ufcon);



	enable_rx_pio(ourport);

drivers/tty/serial/serial_core.c

+1 −1
Original line number Diff line number Diff line
@@ -1770,7 +1770,7 @@ static const struct file_operations uart_proc_fops = { 
 *	@port: the port to write the message

 *	@s: array of characters

 *	@count: number of characters in string to write

 *	@write: function to write character to port

 *	@putchar: function to write character to port

 */

void uart_console_write(struct uart_port *port, const char *s,

			unsigned int count,