Commit 99793c66 authored by Anton Vorontsov's avatar Anton Vorontsov Committed by Greg Kroah-Hartman

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: default avatarAnton Vorontsov <cbouatmailru@gmail.com>
Acked-by: default avatarTobias Klauser <tklauser@distanz.ch>
Cc: Alan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 0d426eda
...@@ -28,6 +28,8 @@ ...@@ -28,6 +28,8 @@
#include <linux/altera_uart.h> #include <linux/altera_uart.h>
#define DRV_NAME "altera_uart" #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: * 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) ...@@ -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 uart_driver altera_uart_driver;
static struct console altera_uart_console = { static struct console altera_uart_console = {
.name = "ttyS", .name = "ttyAL",
.write = altera_uart_console_write, .write = altera_uart_console_write,
.device = uart_console_device, .device = uart_console_device,
.setup = altera_uart_console_setup, .setup = altera_uart_console_setup,
...@@ -502,9 +504,9 @@ console_initcall(altera_uart_console_init); ...@@ -502,9 +504,9 @@ console_initcall(altera_uart_console_init);
static struct uart_driver altera_uart_driver = { static struct uart_driver altera_uart_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.driver_name = DRV_NAME, .driver_name = DRV_NAME,
.dev_name = "ttyS", .dev_name = "ttyAL",
.major = TTY_MAJOR, .major = SERIAL_ALTERA_MAJOR,
.minor = 64, .minor = SERIAL_ALTERA_MINOR,
.nr = CONFIG_SERIAL_ALTERA_UART_MAXPORTS, .nr = CONFIG_SERIAL_ALTERA_UART_MAXPORTS,
.cons = ALTERA_UART_CONSOLE, .cons = ALTERA_UART_CONSOLE,
}; };
...@@ -603,3 +605,4 @@ MODULE_DESCRIPTION("Altera UART driver"); ...@@ -603,3 +605,4 @@ MODULE_DESCRIPTION("Altera UART driver");
MODULE_AUTHOR("Thomas Chou <thomas@wytron.com.tw>"); MODULE_AUTHOR("Thomas Chou <thomas@wytron.com.tw>");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:" DRV_NAME); MODULE_ALIAS("platform:" DRV_NAME);
MODULE_ALIAS_CHARDEV_MAJOR(SERIAL_ALTERA_MAJOR);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment