From: Tom Rini <trini@kernel.crashing.org>
To: Kernel Mailing List <linux-kernel@vger.kernel.org>,
Andrew Morton <akpm@osdl.org>,
Russell King <rmk@arm.linux.org.uk>,
Torben Mathiasen <device@lanana.org>
Subject: [PATCH 2.6.10-rc1] Fix CPM2 uart driver device number brain damage
Date: Mon, 1 Nov 2004 15:10:22 -0700 [thread overview]
Message-ID: <20041101221022.GO24459@smtp.west.cox.net> (raw)
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). I don't
know whose tree this should go in, however..
Signed-off-by: Tom Rini <trini@kernel.crashing.org>
--- 1.3/drivers/serial/cpm_uart/cpm_uart.h 2004-06-21 08:37:14 -07:00
+++ edited/drivers/serial/cpm_uart/cpm_uart.h 2004-11-01 15:05:21 -07:00
@@ -17,13 +17,8 @@
#include "cpm_uart_cpm1.h"
#endif
-#ifndef CONFIG_SERIAL_8250
-#define SERIAL_CPM_MAJOR TTY_MAJOR
-#define SERIAL_CPM_MINOR 64
-#else
#define SERIAL_CPM_MAJOR 204
-#define SERIAL_CPM_MINOR 42
-#endif
+#define SERIAL_CPM_MINOR 46
#define IS_SMC(pinfo) (pinfo->flags & FLAG_SMC)
#define IS_DISCARDING(pinfo) (pinfo->flags & FLAG_DISCARDING)
--- 1.21/Documentation/devices.txt 2004-10-20 15:28:12 -07:00
+++ edited/Documentation/devices.txt 2004-11-01 15:03:02 -07:00
@@ -2758,6 +2758,10 @@
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 @@
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
--
Tom Rini
http://gate.crashing.org/~trini/
reply other threads:[~2004-11-01 23:26 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20041101221022.GO24459@smtp.west.cox.net \
--to=trini@kernel.crashing.org \
--cc=akpm@osdl.org \
--cc=device@lanana.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rmk@arm.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®