mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
TTY/Serial patches for 4.12-rc1
Here is the "big" TTY/Serial patch updates for 4.12-rc1 Not a lot of new things here, the normal number of serial driver updates and additions, tiny bugs fixed, and some core files split up to make future changes a bit easier for Nicolas's "tiny-tty" work. All of these have been in linux-next for a while. There will be a merge conflict with include/linux/serdev.h coming from the bluetooth tree merge, which we knew about, as we wanted some of the serdev changes to go in through that tree. I'll send the expected merge result as a follow-on message. Signed-off-by: Greg Kroah-Hartman <[email protected]> -----BEGIN PGP SIGNATURE----- iGwEABECAC0WIQT0tgzFv3jCIUoxPcsxR9QN2y37KQUCWRA9rw8cZ3JlZ0Brcm9h aC5jb20ACgkQMUfUDdst+yn8OwCXSoCtZMGl25ohu1osCL5G0UEMtgCg2Z9k7hDk LpQTTN98hHn/VwM47ro= =X8sk -----END PGP SIGNATURE----- Merge tag 'tty-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty Pull tty/serial updates from Greg KH: "Here is the "big" TTY/Serial patch updates for 4.12-rc1 Not a lot of new things here, the normal number of serial driver updates and additions, tiny bugs fixed, and some core files split up to make future changes a bit easier for Nicolas's "tiny-tty" work. All of these have been in linux-next for a while" * tag 'tty-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (62 commits) serial: small Makefile reordering tty: split job control support into a file of its own tty: move baudrate handling code to a file of its own console: move console_init() out of tty_io.c serial: 8250_early: Add earlycon support for Palmchip UART tty: pl011: use "qdf2400_e44" as the earlycon name for QDF2400 E44 vt: make mouse selection of non-ASCII consistent vt: set mouse selection word-chars to gpm's default imx-serial: Reduce RX DMA startup latency when opening for reading serial: omap: suspend device on probe errors serial: omap: fix runtime-pm handling on unbind tty: serial: omap: add UPF_BOOT_AUTOCONF flag for DT init serial: samsung: Remove useless spinlock serial: samsung: Add missing checks for dma_map_single failure serial: samsung: Use right device for DMA-mapping calls serial: imx: setup DCEDTE early and ensure DCD and RI irqs to be off tty: fix comment typo s/repsonsible/responsible/ tty: amba-pl011: Fix spurious TX interrupts serial: xuartps: Enable clocks in the pm disable case also serial: core: Re-use struct uart_port {name} field ...
This commit is contained in:
commit
8f3207c7ea
48 changed files with 1393 additions and 1031 deletions
|
|
@ -2,12 +2,13 @@
|
|||
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/console.h>
|
||||
#include <linux/errno.h>
|
||||
#include <linux/string.h>
|
||||
|
||||
#include "console_cmdline.h"
|
||||
#include "braille.h"
|
||||
|
||||
char *_braille_console_setup(char **str, char **brl_options)
|
||||
int _braille_console_setup(char **str, char **brl_options)
|
||||
{
|
||||
if (!strncmp(*str, "brl,", 4)) {
|
||||
*brl_options = "";
|
||||
|
|
@ -15,14 +16,14 @@ char *_braille_console_setup(char **str, char **brl_options)
|
|||
} else if (!strncmp(*str, "brl=", 4)) {
|
||||
*brl_options = *str + 4;
|
||||
*str = strchr(*brl_options, ',');
|
||||
if (!*str)
|
||||
if (!*str) {
|
||||
pr_err("need port name after brl=\n");
|
||||
else
|
||||
*((*str)++) = 0;
|
||||
} else
|
||||
return NULL;
|
||||
return -EINVAL;
|
||||
}
|
||||
*((*str)++) = 0;
|
||||
}
|
||||
|
||||
return *str;
|
||||
return 0;
|
||||
}
|
||||
|
||||
int
|
||||
|
|
|
|||
|
|
@ -9,7 +9,14 @@ braille_set_options(struct console_cmdline *c, char *brl_options)
|
|||
c->brl_options = brl_options;
|
||||
}
|
||||
|
||||
char *
|
||||
/*
|
||||
* Setup console according to braille options.
|
||||
* Return -EINVAL on syntax error, 0 on success (or no braille option was
|
||||
* actually given).
|
||||
* Modifies str to point to the serial options
|
||||
* Sets brl_options to the parsed braille options.
|
||||
*/
|
||||
int
|
||||
_braille_console_setup(char **str, char **brl_options);
|
||||
|
||||
int
|
||||
|
|
@ -25,10 +32,10 @@ braille_set_options(struct console_cmdline *c, char *brl_options)
|
|||
{
|
||||
}
|
||||
|
||||
static inline char *
|
||||
static inline int
|
||||
_braille_console_setup(char **str, char **brl_options)
|
||||
{
|
||||
return NULL;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int
|
||||
|
|
|
|||
|
|
@ -2641,6 +2641,30 @@ int unregister_console(struct console *console)
|
|||
}
|
||||
EXPORT_SYMBOL(unregister_console);
|
||||
|
||||
/*
|
||||
* Initialize the console device. This is called *early*, so
|
||||
* we can't necessarily depend on lots of kernel help here.
|
||||
* Just do some early initializations, and do the complex setup
|
||||
* later.
|
||||
*/
|
||||
void __init console_init(void)
|
||||
{
|
||||
initcall_t *call;
|
||||
|
||||
/* Setup the default TTY line discipline. */
|
||||
n_tty_init();
|
||||
|
||||
/*
|
||||
* set up the console device so that later boot sequences can
|
||||
* inform about problems etc..
|
||||
*/
|
||||
call = __con_initcall_start;
|
||||
while (call < __con_initcall_end) {
|
||||
(*call)();
|
||||
call++;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Some boot consoles access data that is in the init section and which will
|
||||
* be discarded after the initcalls have been run. To make sure that no code
|
||||
|
|
|
|||
Loading…
Reference in a new issue