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

Commit 5983faf9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty 

* 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (65 commits)
  tty: serial: imx: move del_timer_sync() to avoid potential deadlock
  imx: add polled io uart methods
  imx: Add save/restore functions for UART control regs
  serial/imx: let probing fail for the dt case without a valid alias
  serial/imx: propagate error from of_alias_get_id instead of using -ENODEV
  tty: serial: imx: Allow UART to be a source for wakeup
  serial: driver for m32 arch should not have DEC alpha errata
  serial/documentation: fix documented name of DCD cpp symbol
  atmel_serial: fix spinlock lockup in RS485 code
  tty: Fix memory leak in virtual console when enable unicode translation
  serial: use DIV_ROUND_CLOSEST instead of open coding it
  serial: add support for 400 and 800 v3 series Titan cards
  serial: bfin-uart: Remove ASYNC_CTS_FLOW flag for hardware automatic CTS.
  serial: bfin-uart: Enable hardware automatic CTS only when CTS pin is available.
  serial: make FSL errata depend on 8250_CONSOLE, not just 8250
  serial: add irq handler for Freescale 16550 errata.
  serial: manually inline serial8250_handle_port
  serial: make 8250 timeout use the specified IRQ handler
  serial: export the key functions for an 8250 IRQ handler
  serial: clean up parameter passing for 8250 Rx IRQ handling
  ...
parents 21a2cb56 995234da

Documentation/serial/driver

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ hardware. 
	Returns the current state of modem control inputs.  The state

	of the outputs should not be returned, since the core keeps

	track of their state.  The state information should include:

		- TIOCM_DCD	state of DCD signal

		- TIOCM_CAR	state of DCD signal

		- TIOCM_CTS	state of CTS signal

		- TIOCM_DSR	state of DSR signal

		- TIOCM_RI	state of RI signal

arch/powerpc/kernel/legacy_serial.c

+3 −0
Original line number Diff line number Diff line
@@ -441,6 +441,9 @@ static void __init fixup_port_irq(int index, 
		return;



	port->irq = virq;



	if (of_device_is_compatible(np, "fsl,ns16550"))

		port->handle_irq = fsl8250_handle_irq;

}



static void __init fixup_port_pio(int index,

arch/x86/include/asm/mrst.h

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ extern struct console early_mrst_console; 
extern void mrst_early_console_init(void);



extern struct console early_hsu_console;

extern void hsu_early_console_init(void);

extern void hsu_early_console_init(const char *);



extern void intel_scu_devices_create(void);

extern void intel_scu_devices_destroy(void);

arch/x86/kernel/early_printk.c

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ static int __init setup_early_printk(char *buf) 
		}



		if (!strncmp(buf, "hsu", 3)) {

			hsu_early_console_init();

			hsu_early_console_init(buf + 3);

			early_console_register(&early_hsu_console, keep);

		}

#endif

arch/x86/platform/mrst/early_printk_mrst.c

+12 −4
Original line number Diff line number Diff line
@@ -245,16 +245,24 @@ struct console early_mrst_console = { 
 * Following is the early console based on Medfield HSU (High

 * Speed UART) device.

 */

#define HSU_PORT2_PADDR		0xffa28180

#define HSU_PORT_BASE		0xffa28080



static void __iomem *phsu;



void hsu_early_console_init(void)

void hsu_early_console_init(const char *s)

{

	unsigned long paddr, port = 0;

	u8 lcr;



	phsu = (void *)set_fixmap_offset_nocache(FIX_EARLYCON_MEM_BASE,

							HSU_PORT2_PADDR);

	/*

	 * Select the early HSU console port if specified by user in the

	 * kernel command line.

	 */

	if (*s && !kstrtoul(s, 10, &port))

		port = clamp_val(port, 0, 2);



	paddr = HSU_PORT_BASE + port * 0x80;

	phsu = (void *)set_fixmap_offset_nocache(FIX_EARLYCON_MEM_BASE, paddr);



	/* Disable FIFO */

	writeb(0x0, phsu + UART_FCR);