altera_uart: Make it possible to use Altera UART and 8250 ports together
This fixes tty name, major and minor numbers. The major number 204 is used across many platform-specific serial drivers, so we use that. Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com> Acked-by: Tobias Klauser <tklauser@distanz.ch> Cc: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
0d426eda7c
commit
99793c660c
|
@ -28,6 +28,8 @@
|
|||
#include <linux/altera_uart.h>
|
||||
|
||||
#define DRV_NAME "altera_uart"
|
||||
#define SERIAL_ALTERA_MAJOR 204
|
||||
#define SERIAL_ALTERA_MINOR 213
|
||||
|
||||
/*
|
||||
* Altera UART register definitions according to the Nios UART datasheet:
|
||||
|
@ -471,7 +473,7 @@ static int __init altera_uart_console_setup(struct console *co, char *options)
|
|||
static struct uart_driver altera_uart_driver;
|
||||
|
||||
static struct console altera_uart_console = {
|
||||
.name = "ttyS",
|
||||
.name = "ttyAL",
|
||||
.write = altera_uart_console_write,
|
||||
.device = uart_console_device,
|
||||
.setup = altera_uart_console_setup,
|
||||
|
@ -502,9 +504,9 @@ console_initcall(altera_uart_console_init);
|
|||
static struct uart_driver altera_uart_driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.driver_name = DRV_NAME,
|
||||
.dev_name = "ttyS",
|
||||
.major = TTY_MAJOR,
|
||||
.minor = 64,
|
||||
.dev_name = "ttyAL",
|
||||
.major = SERIAL_ALTERA_MAJOR,
|
||||
.minor = SERIAL_ALTERA_MINOR,
|
||||
.nr = CONFIG_SERIAL_ALTERA_UART_MAXPORTS,
|
||||
.cons = ALTERA_UART_CONSOLE,
|
||||
};
|
||||
|
@ -603,3 +605,4 @@ MODULE_DESCRIPTION("Altera UART driver");
|
|||
MODULE_AUTHOR("Thomas Chou <thomas@wytron.com.tw>");
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_ALIAS("platform:" DRV_NAME);
|
||||
MODULE_ALIAS_CHARDEV_MAJOR(SERIAL_ALTERA_MAJOR);
|
||||
|
|
Loading…
Reference in New Issue