Pull TTY/Serial merge from Greg Kroah-Hartman: "Here's the big tty/serial tree set of changes for 3.8-rc1. Contained in here is a bunch more reworks of the tty port layer from Jiri and bugfixes from Alan, along with a number of other tty and serial driver updates by the various driver authors. Also, Jiri has been coerced^Wconvinced to be the co-maintainer of the TTY layer, which is much appreciated by me. All of these have been in the linux-next tree for a while. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>" Fixed up some trivial conflicts in the staging tree, due to the fwserial driver having come in both ways (but fixed up a bit in the serial tree), and the ioctl handling in the dgrp driver having been done slightly differently (staging tree got that one right, and removed both TIOCGSOFTCAR and TIOCSSOFTCAR). * tag 'tty-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (146 commits) staging: sb105x: fix potential NULL pointer dereference in mp_chars_in_buffer() staging/fwserial: Remove superfluous free staging/fwserial: Use WARN_ONCE when port table is corrupted staging/fwserial: Destruct embedded tty_port on teardown staging/fwserial: Fix build breakage when !CONFIG_BUG staging: fwserial: Add TTY-over-Firewire serial driver drivers/tty/serial/serial_core.c: clean up HIGH_BITS_OFFSET usage staging: dgrp: dgrp_tty.c: Audit the return values of get/put_user() staging: dgrp: dgrp_tty.c: Remove the TIOCSSOFTCAR ioctl handler from dgrp driver serial: ifx6x60: Add modem power off function in the platform reboot process serial: mxs-auart: unmap the scatter list before we copy the data serial: mxs-auart: disable the Receive Timeout Interrupt when DMA is enabled serial: max310x: Setup missing "can_sleep" field for GPIO tty/serial: fix ifx6x60.c declaration warning serial: samsung: add devicetree properties for non-Exynos SoCs serial: samsung: fix potential soft lockup during uart write tty: vt: Remove redundant null check before kfree. tty/8250 Add check for pci_ioremap_bar failure tty/8250 Add support for Commtech's Fastcom Async-335 and Fastcom Async-PCIe cards tty/8250 Add XR17D15x devices to the exar_handle_irq override ...
Showing the changes to include/uapi/linux (2 of 166 files). Show all
Unified · Split
| @@ -49,7 +49,8 @@ · 48 unmodified lines | |||
| 49 | #define PORT_XR17D15X 21 /* Exar XR17D15x UART */ | 49 | #define PORT_XR17D15X 21 /* Exar XR17D15x UART */ |
| 50 | #define PORT_LPC3220 22 /* NXP LPC32xx SoC "Standard" UART */ | 50 | #define PORT_LPC3220 22 /* NXP LPC32xx SoC "Standard" UART */ |
| 51 | #define PORT_8250_CIR 23 /* CIR infrared port, has its own driver */ | 51 | #define PORT_8250_CIR 23 /* CIR infrared port, has its own driver */ |
| 52 | #define PORT_MAX_8250 23 /* max port ID */ | 52 | #define PORT_XR17V35X 24 /* Exar XR17V35x UARTs */ |
| 53 | #define PORT_MAX_8250 24 /* max port ID */ | ||
| 53 | 54 | ||
| 54 | /* | 55 | /* |
| 55 | * ARM specific type numbers. These are not currently guaranteed | 56 | * ARM specific type numbers. These are not currently guaranteed |
| @@ -215,5 +216,7 @@ · 159 unmodified lines | |||
| 215 | /* Energy Micro efm32 SoC */ | 216 | /* Energy Micro efm32 SoC */ |
| 216 | #define PORT_EFMUART 100 | 217 | #define PORT_EFMUART 100 |
| 217 | 218 | ||
| 219 | /* ARC (Synopsys) on-chip UART */ | ||
| 220 | #define PORT_ARC 101 | ||
| 218 | 221 | ||
| 219 | #endif /* _UAPILINUX_SERIAL_CORE_H */ | 222 | #endif /* _UAPILINUX_SERIAL_CORE_H */ |
| @@ -367,5 +367,23 @@ · 366 unmodified lines | |||
| 367 | #define UART_OMAP_MDR1_CIR_MODE 0x06 /* CIR mode */ | 367 | #define UART_OMAP_MDR1_CIR_MODE 0x06 /* CIR mode */ |
| 368 | #define UART_OMAP_MDR1_DISABLE 0x07 /* Disable (default state) */ | 368 | #define UART_OMAP_MDR1_DISABLE 0x07 /* Disable (default state) */ |
| 369 | 369 | ||
| 370 | /* | ||
| 371 | * These are definitions for the Exar XR17V35X and XR17(C|D)15X | ||
| 372 | */ | ||
| 373 | #define UART_EXAR_8XMODE 0x88 /* 8X sampling rate select */ | ||
| 374 | #define UART_EXAR_SLEEP 0x8b /* Sleep mode */ | ||
| 375 | #define UART_EXAR_DVID 0x8d /* Device identification */ | ||
| 376 | |||
| 377 | #define UART_EXAR_FCTR 0x08 /* Feature Control Register */ | ||
| 378 | #define UART_FCTR_EXAR_IRDA 0x08 /* IrDa data encode select */ | ||
| 379 | #define UART_FCTR_EXAR_485 0x10 /* Auto 485 half duplex dir ctl */ | ||
| 380 | #define UART_FCTR_EXAR_TRGA 0x00 /* FIFO trigger table A */ | ||
| 381 | #define UART_FCTR_EXAR_TRGB 0x60 /* FIFO trigger table B */ | ||
| 382 | #define UART_FCTR_EXAR_TRGC 0x80 /* FIFO trigger table C */ | ||
| 383 | #define UART_FCTR_EXAR_TRGD 0xc0 /* FIFO trigger table D programmable */ | ||
| 384 | |||
| 385 | #define UART_EXAR_TXTRG 0x0a /* Tx FIFO trigger level write-only */ | ||
| 386 | #define UART_EXAR_RXTRG 0x0b /* Rx FIFO trigger level write-only */ | ||
| 387 | |||
| 370 | #endif /* _LINUX_SERIAL_REG_H */ | 388 | #endif /* _LINUX_SERIAL_REG_H */ |
| 371 | 389 | ||