Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07bafde3 authored by Atsushi Nemoto's avatar Atsushi Nemoto Committed by Linus Torvalds
Browse files

serial_txx9: Use assigned device numbers 



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 use
proper device numbers assigned for it (major 204, minor 196-203).  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: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7f76c403

drivers/serial/serial_txx9.c

+4 −3
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 


#include <asm/io.h>



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 +70,14 @@ static char *serial_name = "TX39/49 Serial driver"; 
#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	196

#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