aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorTom Rini <trini@kernel.crashing.org>2004-11-10 21:42:01 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-11-10 21:42:01 -0800
commitbb97b2d9119429b63de09c8e9d1bb8d14dd7791c (patch)
tree4d8f527e915a2e1d391acc4bb03905e7b41f2c4d /Documentation
parent30c1c5842b28c7f5cb6b4ad4101f7423088626af (diff)
downloadhistory-bb97b2d9119429b63de09c8e9d1bb8d14dd7791c.tar.gz
[PATCH] Fix CPM2 uart driver device number brain damage
The following patch against 2.6.10-rc1 fixes the brain damage that was found in the CPM2 uart driver. Previously, if 8250 was configured in, it would use one set of numbers (which at the time didn't conflict with anything, but have since been officially given to the Motorola i.MX driver) and if 8250 wasn't in, it would masquerade as it. The following switches us over to 204/46...49 (Which is still unclaimed). Signed-off-by: Tom Rini <trini@kernel.crashing.org> Cc: <rmk@arm.linux.org.uk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devices.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/devices.txt b/Documentation/devices.txt
index 7576788f1a643e..f115145e58a2ae 100644
--- a/Documentation/devices.txt
+++ b/Documentation/devices.txt
@@ -2758,6 +2758,10 @@ Your cooperation is appreciated.
43 = /dev/ttySMX2 Motorola i.MX - port 2
44 = /dev/ttyMM0 Marvell MPSC - port 0
45 = /dev/ttyMM1 Marvell MPSC - port 1
+ 46 = /dev/ttyCPM0 PPC CPM (SCC or SMC) - port 0
+ ...
+ 49 = /dev/ttyCPM5 PPC CPM (SCC or SMC) - port 5
+
205 char Low-density serial ports (alternate device)
0 = /dev/culu0 Callout device for ttyLU0
@@ -2786,6 +2790,9 @@ Your cooperation is appreciated.
41 = /dev/ttySMX0 Callout device for ttySMX0
42 = /dev/ttySMX1 Callout device for ttySMX1
43 = /dev/ttySMX2 Callout device for ttySMX2
+ 46 = /dev/cucpm0 Callout device for ttyCPM0
+ ...
+ 49 = /dev/cucpm5 Callout device for ttyCPM5
206 char OnStream SC-x0 tape devices
0 = /dev/osst0 First OnStream SCSI tape, mode 0