From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932646Ab0JANWc (ORCPT ); Fri, 1 Oct 2010 09:22:32 -0400 Received: from mail-ey0-f174.google.com ([209.85.215.174]:33073 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932339Ab0JANW3 (ORCPT ); Fri, 1 Oct 2010 09:22:29 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=qodL913yHMp/RkTAsXMFLqj4gf8IAnxbWOQWsMgl1+VzK3k8usZCLAKUFLt6l89Ks5 QWTsuknbthiBWGGB6hKXP2UfNCxzJDxVEtLRpFwvBy8fVkBNrRshDiV3pVa/PtR7Oofm ftXwC9TGYd9iWmGNynOQYL5TRT33G6Uxg9TAI= Date: Fri, 1 Oct 2010 17:22:07 +0400 From: Anton Vorontsov To: Greg Kroah-Hartman Cc: Alan Cox , Andrew Morton , Tobias Klauser , linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/8] altera_uart: Make it possible to use Altera UART and 8250 ports together Message-ID: <20101001132207.GE25897@oksana.dev.rtsoft.ru> References: <20101001132045.GA9649@oksana.dev.rtsoft.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20101001132045.GA9649@oksana.dev.rtsoft.ru> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This fixes tty name and major number conflicts. The major number 204 is used across many platform-specific serial drivers, so we use that. Signed-off-by: Anton Vorontsov Acked-by: Tobias Klauser --- drivers/serial/altera_uart.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/serial/altera_uart.c b/drivers/serial/altera_uart.c index f1985aa..99e007f 100644 --- a/drivers/serial/altera_uart.c +++ b/drivers/serial/altera_uart.c @@ -28,6 +28,7 @@ #include #define DRV_NAME "altera_uart" +#define SERIAL_ALTERA_MAJOR 204 /* * Altera UART register definitions according to the Nios UART datasheet: @@ -471,7 +472,7 @@ static int __init altera_uart_console_setup(struct console *co, char *options) static struct uart_driver altera_uart_driver; static struct console altera_uart_console = { - .name = "ttyS", + .name = "ttyAL", .write = altera_uart_console_write, .device = uart_console_device, .setup = altera_uart_console_setup, @@ -502,8 +503,8 @@ console_initcall(altera_uart_console_init); static struct uart_driver altera_uart_driver = { .owner = THIS_MODULE, .driver_name = DRV_NAME, - .dev_name = "ttyS", - .major = TTY_MAJOR, + .dev_name = "ttyAL", + .major = SERIAL_ALTERA_MAJOR, .minor = 64, .nr = CONFIG_SERIAL_ALTERA_UART_MAXPORTS, .cons = ALTERA_UART_CONSOLE, @@ -603,3 +604,4 @@ MODULE_DESCRIPTION("Altera UART driver"); MODULE_AUTHOR("Thomas Chou "); MODULE_LICENSE("GPL"); MODULE_ALIAS("platform:" DRV_NAME); +MODULE_ALIAS_CHARDEV_MAJOR(SERIAL_ALTERA_MAJOR); -- 1.7.0.5