TTY/Serial driver updates for 6.3-rc1
Here is the big set of serial and tty driver updates for 6.3-rc1. Once again, Jiri and Ilpo have done a number of core vt and tty/serial layer cleanups that were much needed and appreciated. Other than that, it's just a bunch of little tty/serial driver updates: - qcom-geni-serial driver updates - liteuart driver updates - hvcs driver cleanups - n_gsm updates and additions for new features - more 8250 device support added - fpga/dfl update and additions - imx serial driver updates - fsl_lpuart updates - other tiny fixes and updates for serial drivers All of these have been in linux-next for a while with no reported problems. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- iG0EABECAC0WIQT0tgzFv3jCIUoxPcsxR9QN2y37KQUCY/itAw8cZ3JlZ0Brcm9h aC5jb20ACgkQMUfUDdst+ykJbQCfWv/J4ZElO108iHBU5mJCDagUDBgAnAtLLN6A SEAnnokGCDtA/BNIXeES =luRi -----END PGP SIGNATURE----- Merge tag 'tty-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty Pull tty / serial driver updates from Greg KH: "Here is the big set of serial and tty driver updates for 6.3-rc1. Once again, Jiri and Ilpo have done a number of core vt and tty/serial layer cleanups that were much needed and appreciated. Other than that, it's just a bunch of little tty/serial driver updates: - qcom-geni-serial driver updates - liteuart driver updates - hvcs driver cleanups - n_gsm updates and additions for new features - more 8250 device support added - fpga/dfl update and additions - imx serial driver updates - fsl_lpuart updates - other tiny fixes and updates for serial drivers All of these have been in linux-next for a while with no reported problems" * tag 'tty-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (143 commits) tty: n_gsm: add keep alive support serial: imx: remove a redundant check dt-bindings: serial: snps-dw-apb-uart: add dma & dma-names properties soc: qcom: geni-se: Move qcom-geni-se.h to linux/soc/qcom/geni-se.h tty: n_gsm: add TIOCMIWAIT support tty: n_gsm: add RING/CD control support tty: n_gsm: mark unusable ioctl structure fields accordingly serial: imx: get rid of registers shadowing serial: imx: refine local variables in rxint() serial: imx: stop using USR2 in FIFO reading loop serial: imx: remove redundant USR2 read from FIFO reading loop serial: imx: do not break from FIFO reading loop prematurely serial: imx: do not sysrq broken chars serial: imx: work-around for hardware RX flood serial: imx: factor-out common code to imx_uart_soft_reset() serial: 8250_pci1xxxx: Add power management functions to quad-uart driver serial: 8250_pci1xxxx: Add RS485 support to quad-uart driver serial: 8250_pci1xxxx: Add driver for quad-uart support serial: 8250_pci: Add serial8250_pci_setup_port definition in 8250_pcilib.c tty: pcn_uart: fix memory leak with using debugfs_lookup() ...
This commit is contained in:
commit
17cd4d6f05
104 changed files with 2927 additions and 1302 deletions
|
|
@ -19,8 +19,7 @@ struct gsm_config
|
|||
unsigned int mtu;
|
||||
unsigned int k;
|
||||
unsigned int i;
|
||||
unsigned int unused[8]; /* Padding for expansion without
|
||||
breaking stuff */
|
||||
unsigned int unused[8]; /* Can not be used */
|
||||
};
|
||||
|
||||
#define GSMIOC_GETCONF _IOR('G', 0, struct gsm_config)
|
||||
|
|
@ -29,9 +28,9 @@ struct gsm_config
|
|||
struct gsm_netconfig {
|
||||
unsigned int adaption; /* Adaption to use in network mode */
|
||||
unsigned short protocol;/* Protocol to use - only ETH_P_IP supported */
|
||||
unsigned short unused2;
|
||||
unsigned short unused2; /* Can not be used */
|
||||
char if_name[IFNAMSIZ]; /* interface name format string */
|
||||
__u8 unused[28]; /* For future use */
|
||||
__u8 unused[28]; /* Can not be used */
|
||||
};
|
||||
|
||||
#define GSMIOC_ENABLE_NET _IOW('G', 2, struct gsm_netconfig)
|
||||
|
|
@ -40,4 +39,14 @@ struct gsm_netconfig {
|
|||
/* get the base tty number for a configured gsmmux tty */
|
||||
#define GSMIOC_GETFIRST _IOR('G', 4, __u32)
|
||||
|
||||
struct gsm_config_ext {
|
||||
__u32 keep_alive; /* Control channel keep-alive in 1/100th of a
|
||||
* second (0 to disable)
|
||||
*/
|
||||
__u32 reserved[7]; /* For future use, must be initialized to zero */
|
||||
};
|
||||
|
||||
#define GSMIOC_GETCONF_EXT _IOR('G', 5, struct gsm_config_ext)
|
||||
#define GSMIOC_SETCONF_EXT _IOW('G', 6, struct gsm_config_ext)
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -161,19 +161,25 @@ struct console_font_op {
|
|||
unsigned int flags; /* KD_FONT_FLAG_* */
|
||||
unsigned int width, height; /* font size */
|
||||
unsigned int charcount;
|
||||
unsigned char __user *data; /* font data with height fixed to 32 */
|
||||
unsigned char __user *data; /* font data with vpitch fixed to 32 for
|
||||
* KD_FONT_OP_SET/GET
|
||||
*/
|
||||
};
|
||||
|
||||
struct console_font {
|
||||
unsigned int width, height; /* font size */
|
||||
unsigned int charcount;
|
||||
unsigned char *data; /* font data with height fixed to 32 */
|
||||
unsigned char *data; /* font data with vpitch fixed to 32 for
|
||||
* KD_FONT_OP_SET/GET
|
||||
*/
|
||||
};
|
||||
|
||||
#define KD_FONT_OP_SET 0 /* Set font */
|
||||
#define KD_FONT_OP_GET 1 /* Get font */
|
||||
#define KD_FONT_OP_SET_DEFAULT 2 /* Set font to default, data points to name / NULL */
|
||||
#define KD_FONT_OP_COPY 3 /* Obsolete, do not use */
|
||||
#define KD_FONT_OP_SET_TALL 4 /* Set font with vpitch = height */
|
||||
#define KD_FONT_OP_GET_TALL 5 /* Get font with vpitch = height */
|
||||
|
||||
#define KD_FONT_FLAG_DONT_RECALC 1 /* Don't recalculate hw charcell size [compat] */
|
||||
|
||||
|
|
|
|||
|
|
@ -207,6 +207,9 @@
|
|||
/* Atheros AR933X SoC */
|
||||
#define PORT_AR933X 99
|
||||
|
||||
/* MCHP 16550A UART with 256 byte FIFOs */
|
||||
#define PORT_MCHP16550A 100
|
||||
|
||||
/* ARC (Synopsys) on-chip UART */
|
||||
#define PORT_ARC 101
|
||||
|
||||
|
|
|
|||
|
|
@ -44,6 +44,11 @@
|
|||
#define UART_IIR_RX_TIMEOUT 0x0c /* OMAP RX Timeout interrupt */
|
||||
#define UART_IIR_XOFF 0x10 /* OMAP XOFF/Special Character */
|
||||
#define UART_IIR_CTS_RTS_DSR 0x20 /* OMAP CTS/RTS/DSR Change */
|
||||
#define UART_IIR_64BYTE_FIFO 0x20 /* 16750 64 bytes FIFO */
|
||||
#define UART_IIR_FIFO_ENABLED 0xc0 /* FIFOs enabled / port type identification */
|
||||
#define UART_IIR_FIFO_ENABLED_8250 0x00 /* 8250: no FIFO */
|
||||
#define UART_IIR_FIFO_ENABLED_16550 0x80 /* 16550: (broken/unusable) FIFO */
|
||||
#define UART_IIR_FIFO_ENABLED_16550A 0xc0 /* 16550A: FIFO enabled */
|
||||
|
||||
#define UART_FCR 2 /* Out: FIFO Control Register */
|
||||
#define UART_FCR_ENABLE_FIFO 0x01 /* Enable the FIFO */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue