From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1946029AbXDDACV (ORCPT ); Tue, 3 Apr 2007 20:02:21 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1946036AbXDDACV (ORCPT ); Tue, 3 Apr 2007 20:02:21 -0400 Received: from pentafluge.infradead.org ([213.146.154.40]:43306 "EHLO pentafluge.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1946029AbXDDACU (ORCPT ); Tue, 3 Apr 2007 20:02:20 -0400 Subject: [PATCH v2] Stop pmac_zilog from abusing 8250's device numbers. From: David Woodhouse To: Brad Boyer Cc: Paul Mackerras , linuxppc-dev@ozlabs.org, linux-kernel@vger.kernel.org In-Reply-To: <20070403212928.GA12951@cynthia.pants.nu> References: <1175610345.2665.15.camel@shinybook.infradead.org> <17938.57292.870224.132415@cargo.ozlabs.ibm.com> <1175642916.10567.24.camel@shinybook.infradead.org> <20070403212928.GA12951@cynthia.pants.nu> Content-Type: text/plain Date: Tue, 03 Apr 2007 20:01:35 -0400 Message-Id: <1175644895.10567.34.camel@shinybook.infradead.org> Mime-Version: 1.0 X-Mailer: Evolution 2.10.0 (2.10.0-7.fc7.dwmw2.2) Content-Transfer-Encoding: 7bit X-Bad-Reply: References and In-Reply-To but no 'Re:' in Subject. X-SRS-Rewrite: SMTP reverse-path rewritten from by pentafluge.infradead.org See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org There are proper device numbers registered for pmac_zilog now. Use them, and change the name of the device to 'ttyPZ%d'. This allows the pmac_zilog and 8250 drivers to co-exist in the kernel. Signed-off-by: David Woodhouse diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c index 752ef07..2ab23af 100644 --- a/drivers/serial/pmac_zilog.c +++ b/drivers/serial/pmac_zilog.c @@ -99,9 +99,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 = "ttyPZ", + .dev_name = "ttyPZ", + .major = 204, + .minor = 192, }; @@ -1776,7 +1777,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 = "ttyPZ", .write = pmz_console_write, .device = uart_console_device, .setup = pmz_console_setup, @@ -1800,7 +1801,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 -- dwmw2