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

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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (68 commits)
  U6715 16550A serial driver support
  Char: nozomi, set tty->driver_data appropriately
  Char: nozomi, fix tty->count counting
  serial: max3107: Fix gpiolib support
  hsu: call PCI pm hooks in suspend/resume function
  hsu: some code cleanup
  hsu: add a periodic timer to check dma rx channel
  hsu: driver for Medfield High Speed UART device
  mxser: remove unnesesary NULL check
  serial: add support for OX16PCI958 card
  serial: 68328serial.c: remove dead (ALMA_ANS | DRAGONIXVZ | M68EZ328ADS)
  timbuart: use __devinit and __devexit macros for probe and remove
  serial: MMIO32 support for 8250_early.c
  serial: mcf: don't take spinlocks in already protected functions
  serial: general fixes in the serial_rs485 structure
  serial: fix missing bit coverage of ASYNC_FLAGS
  serial: "altera_uart: simplify altera_uart_console_putc()" checkpatch fixes
  serial: crisv10: formatting of pointers in printk()
  vt: Fix warning: statement with no effect due to vt_kern.h
  tty_io: remove casts from void*
  ...
parents a92b166e 235dae5d

Documentation/kernel-parameters.txt

+3 −0
Original line number Diff line number Diff line
@@ -681,8 +681,11 @@ and is between 256 and 4096 characters. It is defined in the file 
	earlycon=	[KNL] Output early console device and options.

		uart[8250],io,<addr>[,options]

		uart[8250],mmio,<addr>[,options]

		uart[8250],mmio32,<addr>[,options]

			Start an early, polled-mode console on the 8250/16550

			UART at the specified I/O port or MMIO address.

			MMIO inter-register address stride is either 8bit (mmio)

                        or 32bit (mmio32).

			The options are the same as for ttyS, above.



	earlyprintk=	[X86,SH,BLACKFIN]

arch/alpha/include/asm/ioctls.h

+2 −2
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ 
# define TIOCPKT_START		 8

# define TIOCPKT_NOSTOP		16

# define TIOCPKT_DOSTOP		32

# define TIOCPKT_IOCTL		64





#define TIOCNOTTY	0x5422
@@ -91,6 +92,7 @@ 
#define TIOCGSID	0x5429  /* Return the session ID of FD */

#define TIOCGPTN	_IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */

#define TIOCSPTLCK	_IOW('T',0x31, int)  /* Lock/unlock Pty */

#define TIOCSIG		_IOW('T',0x36, int)  /* Generate signal on Pty slave */



#define TIOCSERCONFIG	0x5453

#define TIOCSERGWILD	0x5454
@@ -106,7 +108,5 @@ 


#define TIOCMIWAIT	0x545C	/* wait for a change on serial input line(s) */

#define TIOCGICOUNT	0x545D	/* read serial port inline interrupt counts */

#define TIOCGHAYESESP	0x545E  /* Get Hayes ESP configuration */

#define TIOCSHAYESESP	0x545F  /* Set Hayes ESP configuration */



#endif /* _ASM_ALPHA_IOCTLS_H */

arch/alpha/include/asm/termbits.h

+1 −0
Original line number Diff line number Diff line
@@ -180,6 +180,7 @@ struct ktermios { 
#define FLUSHO	0x00800000

#define PENDIN	0x20000000

#define IEXTEN	0x00000400

#define EXTPROC	0x10000000



/* Values for the ACTION argument to `tcflow'.  */

#define	TCOOFF		0

arch/arm/include/asm/ioctls.h

+2 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
#define TCSETSF2	_IOW('T',0x2D, struct termios2)

#define TIOCGPTN	_IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */

#define TIOCSPTLCK	_IOW('T',0x31, int)  /* Lock/unlock Pty */

#define TIOCSIG		_IOW('T',0x36, int)  /* Generate signal on Pty slave */



#define TIOCGRS485      0x542E

#define TIOCSRS485      0x542F
@@ -81,6 +82,7 @@ 
#define TIOCPKT_START		 8

#define TIOCPKT_NOSTOP		16

#define TIOCPKT_DOSTOP		32

#define TIOCPKT_IOCTL		64



#define TIOCSER_TEMT	0x01	/* Transmitter physically empty */

arch/arm/include/asm/termbits.h

+1 −0
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ struct ktermios { 
#define FLUSHO	0010000

#define PENDIN	0040000

#define IEXTEN	0100000

#define EXTPROC	0200000



/* tcflow() and TCXONC use these */

#define	TCOOFF		0