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

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

Merge tag 'tty-4.13-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 and serial driver fixes for 4.13-rc2. Nothing
  huge at all, a revert of a patch that turned out to break things, a
  fix up for a new tty ioctl we added in 4.13-rc1 to get the uapi
  definition correct, and a few minor serial driver fixes for reported
  issues.

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

* tag 'tty-4.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  tty: Fix TIOCGPTPEER ioctl definition
  tty: hide unused pty_get_peer function
  tty: serial: lpuart: Fix the logic for detecting the 32-bit type UART
  serial: imx: Prevent TX buffer PIO write when a DMA has been started
  Revert "serial: imx-serial - move DMA buffer configuration to DT"
  serial: sh-sci: Uninitialized variables in sysfs files
  serial: st-asc: Potential error pointer dereference
parents dedaff2f c6325179

Documentation/devicetree/bindings/serial/fsl-imx-uart.txt

+0 −2
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ Optional properties: 
- fsl,irda-mode : Indicate the uart supports irda mode

- fsl,dte-mode : Indicate the uart works in DTE mode. The uart works

                  in DCE mode by default.

- fsl,dma-size : Indicate the size of the DMA buffer and its periods



Please check Documentation/devicetree/bindings/serial/serial.txt

for the complete list of generic properties.
@@ -29,5 +28,4 @@ uart1: serial@73fbc000 { 
	interrupts = <31>;

	uart-has-rtscts;

	fsl,dte-mode;

	fsl,dma-size = <1024 4>;

};

arch/alpha/include/uapi/asm/ioctls.h

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ 
#define TIOCGPKT	_IOR('T', 0x38, int) /* Get packet mode state */

#define TIOCGPTLCK	_IOR('T', 0x39, int) /* Get Pty lock state */

#define TIOCGEXCL	_IOR('T', 0x40, int) /* Get exclusive mode state */

#define TIOCGPTPEER	_IOR('T', 0x41, int) /* Safely open the slave */

#define TIOCGPTPEER	_IO('T', 0x41) /* Safely open the slave */



#define TIOCSERCONFIG	0x5453

#define TIOCSERGWILD	0x5454

arch/mips/include/uapi/asm/ioctls.h

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ 
#define TIOCGPKT	_IOR('T', 0x38, int) /* Get packet mode state */

#define TIOCGPTLCK	_IOR('T', 0x39, int) /* Get Pty lock state */

#define TIOCGEXCL	_IOR('T', 0x40, int) /* Get exclusive mode state */

#define TIOCGPTPEER	_IOR('T', 0x41, int) /* Safely open the slave */

#define TIOCGPTPEER	_IO('T', 0x41) /* Safely open the slave */



/* I hope the range from 0x5480 on is free ... */

#define TIOCSCTTY	0x5480		/* become controlling tty */

arch/parisc/include/uapi/asm/ioctls.h

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ 
#define TIOCGPKT	_IOR('T', 0x38, int) /* Get packet mode state */

#define TIOCGPTLCK	_IOR('T', 0x39, int) /* Get Pty lock state */

#define TIOCGEXCL	_IOR('T', 0x40, int) /* Get exclusive mode state */

#define TIOCGPTPEER	_IOR('T', 0x41, int) /* Safely open the slave */

#define TIOCGPTPEER	_IO('T', 0x41) /* Safely open the slave */



#define FIONCLEX	0x5450  /* these numbers need to be adjusted. */

#define FIOCLEX		0x5451

arch/powerpc/include/uapi/asm/ioctls.h

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ 
#define TIOCGPKT	_IOR('T', 0x38, int) /* Get packet mode state */

#define TIOCGPTLCK	_IOR('T', 0x39, int) /* Get Pty lock state */

#define TIOCGEXCL	_IOR('T', 0x40, int) /* Get exclusive mode state */

#define TIOCGPTPEER	_IOR('T', 0x41, int) /* Safely open the slave */

#define TIOCGPTPEER	_IO('T', 0x41) /* Safely open the slave */



#define TIOCSERCONFIG	0x5453

#define TIOCSERGWILD	0x5454