[POWERPC] Optionally use new device number for pmac_zilog

This adds the option for the pmac_zilog driver to use the major/minor
numbers recently allocated specifically for it (/dev/ttyPZn) instead
of the /dev/ttySn numbers.  The advantage of doing this is that it
allows the pmac_zilog and 8250 drivers to coexist.  The disadvantage
of doing this is that it is a user-visible ABI change and it will
break existing working setups on powermacs, and could be confusing to
users.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 15 insertions, 5 deletions

diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c
index f793ac212672..794bd0f50d73 100644
--- a/drivers/serial/pmac_zilog.c
+++ b/drivers/serial/pmac_zilog.c
@@ -88,6 +88,16 @@ MODULE_LICENSE("GPL");
 
 #define PWRDBG(fmt, arg...)     printk(KERN_DEBUG fmt , ## arg)
 
+#ifdef CONFIG_SERIAL_PMACZILOG_TTYS
+#define PMACZILOG_MAJOR         TTY_MAJOR
+#define PMACZILOG_MINOR         64
+#define PMACZILOG_NAME          "ttyS"
+#else
+#define PMACZILOG_MAJOR         204
+#define PMACZILOG_MINOR         192
+#define PMACZILOG_NAME          "ttyPZ"
+#endif
+
 
 /*
  * For the sake of early serial console, we can do a pre-probe
@@ -99,9 +109,10 @@ static DEFINE_MUTEX(pmz_irq_mutex);
 
 static struct uart_driver pmz_uart_reg = {
         .owner          =       THIS_MODULE,
-        .driver_name    =       "ttyS",
-        .dev_name       =       "ttyS",
-        .major          =       TTY_MAJOR,
+        .driver_name    =       PMACZILOG_NAME,
+        .dev_name       =       PMACZILOG_NAME,
+        .major          =       PMACZILOG_MAJOR,
+        .minor          =       PMACZILOG_MINOR,
 };
 
 
@@ -1778,7 +1789,7 @@ static void pmz_console_write(struct console *con, const char *s, unsigned int c
 static int __init pmz_console_setup(struct console *co, char *options);
 
 static struct console pmz_console = {
-        .name   =       "ttyS",
+        .name   =       PMACZILOG_NAME,
         .write  =       pmz_console_write,
         .device =       uart_console_device,
         .setup  =       pmz_console_setup,
@@ -1802,7 +1813,6 @@ static int __init pmz_register(void)
         
         pmz_uart_reg.nr = pmz_ports_count;
         pmz_uart_reg.cons = PMACZILOG_CONSOLE;
-        pmz_uart_reg.minor = 64;
 
         /*
          * Register this driver with the serial core