From: Atsushi Nemoto The serial_txx9 driver have abused device numbers (major 4, minor 128) if CONFIG_SERIAL_TXX9_STDSERIAL was not set. This patch makes the driver allocate minor numbers from major 204 (Low-density serial ports). I suppose a typical user of this driver set CONFIG_SERIAL_TXX9_STDSERIAL to Y (i.e. use "ttyS0"), so this patch would not cause big compatibility issue. Signed-off-by: Atsushi Nemoto Cc: Ralf Baechle Signed-off-by: Andrew Morton --- Documentation/devices.txt | 3 +++ drivers/serial/serial_txx9.c | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff -puN Documentation/devices.txt~serial-allocate-minor-device-numbers-for Documentation/devices.txt --- a/Documentation/devices.txt~serial-allocate-minor-device-numbers-for +++ a/Documentation/devices.txt @@ -2808,6 +2808,9 @@ Your cooperation is appreciated. ... 190 = /dev/ttyUL3 Xilinx uartlite - port 3 191 = /dev/xvc0 Xen virtual console - port 0 + 192 = /dev/ttyTX0 TX39/49 serial port 0 + ... + 199 = /dev/ttyTX7 TX39/49 serial port 7 205 char Low-density serial ports (alternate device) 0 = /dev/culu0 Callout device for ttyLU0 diff -puN drivers/serial/serial_txx9.c~serial-allocate-minor-device-numbers-for drivers/serial/serial_txx9.c --- a/drivers/serial/serial_txx9.c~serial-allocate-minor-device-numbers-for +++ a/drivers/serial/serial_txx9.c @@ -40,6 +40,7 @@ * 1.07 Use CONFIG_SERIAL_TXX9_NR_UARTS. Cleanup. * 1.08 Use platform_device. * Fix and cleanup suspend/resume/initialization codes. + * 1.09 Use major 204 if CONFIG_SERIAL_TXX9_STDSERIAL was not set. */ #if defined(CONFIG_SERIAL_TXX9_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) @@ -62,7 +63,7 @@ #include -static char *serial_version = "1.08"; +static char *serial_version = "1.09"; static char *serial_name = "TX39/49 Serial driver"; #define PASS_LIMIT 256 @@ -70,13 +71,14 @@ static char *serial_name = "TX39/49 Seri #if !defined(CONFIG_SERIAL_TXX9_STDSERIAL) /* "ttyS" is used for standard serial driver */ #define TXX9_TTY_NAME "ttyTX" -#define TXX9_TTY_MINOR_START (64 + 64) /* ttyTX0(128), ttyTX1(129) */ +#define TXX9_TTY_MINOR_START 192 +#define TXX9_TTY_MAJOR 204 #else /* acts like standard serial driver */ #define TXX9_TTY_NAME "ttyS" #define TXX9_TTY_MINOR_START 64 -#endif #define TXX9_TTY_MAJOR TTY_MAJOR +#endif /* flag aliases */ #define UPF_TXX9_HAVE_CTS_LINE UPF_BUGGY_UART _