Skip to content

Commit e29c3f8

Browse files
rddunlapgregkh
authored andcommitted
Documentation: devices.txt: reconcile serial/ucc_uart minor numers
Reconcile devices.txt with serial/ucc_uart.c regarding device number assignments. ucc_uart.c supports 4 ports and uses minor devnums 46-49, so update devices.txt with that info. Then update ucc_uart.c's reference to the location of the devices.txt list in the kernel source tree. Fixes: d7584ed ("[POWERPC] qe-uart: add support for Freescale QUICCEngine UART") Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Randy Dunlap <[email protected]> Cc: Timur Tabi <[email protected]> Cc: Kumar Gala <[email protected]> Cc: [email protected] Cc: Greg Kroah-Hartman <[email protected]> Cc: Jiri Slaby <[email protected]> Cc: [email protected] Cc: Jonathan Corbet <[email protected]> Cc: [email protected] Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 767bb2a commit e29c3f8

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Documentation/admin-guide/devices.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2691,7 +2691,7 @@
26912691
45 = /dev/ttyMM1 Marvell MPSC - port 1 (obsolete unused)
26922692
46 = /dev/ttyCPM0 PPC CPM (SCC or SMC) - port 0
26932693
...
2694-
47 = /dev/ttyCPM5 PPC CPM (SCC or SMC) - port 5
2694+
49 = /dev/ttyCPM5 PPC CPM (SCC or SMC) - port 3
26952695
50 = /dev/ttyIOC0 Altix serial card
26962696
...
26972697
81 = /dev/ttyIOC31 Altix serial card

drivers/tty/serial/ucc_uart.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ static int firmware_loaded;
5959
/* #define LOOPBACK */
6060

6161
/* The major and minor device numbers are defined in
62-
* http://www.lanana.org/docs/device-list/devices-2.6+.txt. For the QE
62+
* Documentation/admin-guide/devices.txt. For the QE
6363
* UART, we have major number 204 and minor numbers 46 - 49, which are the
6464
* same as for the CPM2. This decision was made because no Freescale part
6565
* has both a CPM and a QE.

0 commit comments

Comments
 (0)