From patchwork Tue Nov 24 22:21:29 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Miller X-Patchwork-Id: 39247 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 550551007D3 for ; Wed, 25 Nov 2009 09:21:19 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933903AbZKXWVM (ORCPT ); Tue, 24 Nov 2009 17:21:12 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S934028AbZKXWVL (ORCPT ); Tue, 24 Nov 2009 17:21:11 -0500 Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:55809 "EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933903AbZKXWVL (ORCPT ); Tue, 24 Nov 2009 17:21:11 -0500 Received: from localhost (localhost [127.0.0.1]) by sunset.davemloft.net (Postfix) with ESMTP id 63318C8C53B; Tue, 24 Nov 2009 14:21:29 -0800 (PST) Date: Tue, 24 Nov 2009 14:21:29 -0800 (PST) Message-Id: <20091124.142129.107634104.davem@davemloft.net> To: sparclinux@vger.kernel.org CC: Hermann.Lauer@iwr.uni-heidelberg.de Subject: [PATCH 3/7]: sunsu: Fix detection of SU ports which are RSC console or control. 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 These device nodes are named "rsc-console" and "rsc-control" rather than 'serial', but the device_type property is 'serial' so we'll tip off of that for detection. Signed-off-by: David S. Miller --- drivers/serial/sunsu.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c index 68d262b..f6511a4 100644 --- a/drivers/serial/sunsu.c +++ b/drivers/serial/sunsu.c @@ -1517,6 +1517,10 @@ static const struct of_device_id su_match[] = { .name = "serial", .compatible = "su", }, + { + .type = "serial", + .compatible = "su", + }, {}, }; MODULE_DEVICE_TABLE(of, su_match); @@ -1548,6 +1552,12 @@ static int __init sunsu_init(void) num_uart++; } } + for_each_node_by_type(dp, "serial") { + if (of_device_is_compatible(dp, "su")) { + if (su_get_type(dp) == SU_PORT_PORT) + num_uart++; + } + } if (num_uart) { err = sunserial_register_minors(&sunsu_reg, num_uart);