From patchwork Tue Nov 24 22:21:38 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Miller X-Patchwork-Id: 39250 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 092801007D4 for ; Wed, 25 Nov 2009 09:21:28 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934070AbZKXWVU (ORCPT ); Tue, 24 Nov 2009 17:21:20 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S934072AbZKXWVU (ORCPT ); Tue, 24 Nov 2009 17:21:20 -0500 Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:55819 "EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934070AbZKXWVU (ORCPT ); Tue, 24 Nov 2009 17:21:20 -0500 Received: from localhost (localhost [127.0.0.1]) by sunset.davemloft.net (Postfix) with ESMTP id 708BEC8C53B; Tue, 24 Nov 2009 14:21:38 -0800 (PST) Date: Tue, 24 Nov 2009 14:21:38 -0800 (PST) Message-Id: <20091124.142138.85245096.davem@davemloft.net> To: sparclinux@vger.kernel.org CC: Hermann.Lauer@iwr.uni-heidelberg.de Subject: [PATCH 6/7]: sunsu: Pass true 'ignore_line' to console match when RSC or LOM console. From: David Miller X-Mailer: Mew version 6.2.51 on Emacs 22.1 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org Signed-off-by: David S. Miller --- drivers/serial/sunsu.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c index 4868b31..4ee4167 100644 --- a/drivers/serial/sunsu.c +++ b/drivers/serial/sunsu.c @@ -1409,6 +1409,7 @@ static int __devinit su_probe(struct of_device *op, const struct of_device_id *m struct uart_sunsu_port *up; struct resource *rp; enum su_type type; + bool ignore_line; int err; type = su_get_type(dp); @@ -1467,9 +1468,14 @@ static int __devinit su_probe(struct of_device *op, const struct of_device_id *m up->port.ops = &sunsu_pops; + ignore_line = false; + if (!strcmp(dp->name, "rsc-console") || + !strcmp(dp->name, "lom-console")) + ignore_line = true; + sunserial_console_match(SUNSU_CONSOLE(), dp, &sunsu_reg, up->port.line, - false); + ignore_line); err = uart_add_one_port(&sunsu_reg, &up->port); if (err) goto out_unmap;