From patchwork Thu Sep 22 06:48:13 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 4243 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id A69A323EFD for ; Thu, 22 Sep 2011 06:38:42 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id 94FFEA183DB for ; Thu, 22 Sep 2011 06:38:42 +0000 (UTC) Received: by fxe23 with SMTP id 23so3441836fxe.11 for ; Wed, 21 Sep 2011 23:38:42 -0700 (PDT) Received: by 10.223.63.8 with SMTP id z8mr2483065fah.84.1316673522410; Wed, 21 Sep 2011 23:38:42 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.18.198 with SMTP id y6cs157362lad; Wed, 21 Sep 2011 23:38:41 -0700 (PDT) Received: by 10.229.61.161 with SMTP id t33mr1404760qch.114.1316673520834; Wed, 21 Sep 2011 23:38:40 -0700 (PDT) Received: from TX2EHSOBE008.bigfish.com (tx2ehsobe004.messaging.microsoft.com. [65.55.88.14]) by mx.google.com with ESMTPS id z8si1786139qct.87.2011.09.21.23.38.40 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 21 Sep 2011 23:38:40 -0700 (PDT) Received-SPF: neutral (google.com: 65.55.88.14 is neither permitted nor denied by best guess record for domain of shawn.guo@linaro.org) client-ip=65.55.88.14; Authentication-Results: mx.google.com; spf=neutral (google.com: 65.55.88.14 is neither permitted nor denied by best guess record for domain of shawn.guo@linaro.org) smtp.mail=shawn.guo@linaro.org Received: from mail151-tx2-R.bigfish.com (10.9.14.251) by TX2EHSOBE008.bigfish.com (10.9.40.28) with Microsoft SMTP Server id 14.1.225.22; Thu, 22 Sep 2011 06:38:39 +0000 Received: from mail151-tx2 (localhost.localdomain [127.0.0.1]) by mail151-tx2-R.bigfish.com (Postfix) with ESMTP id 9A752D38132; Thu, 22 Sep 2011 06:38:39 +0000 (UTC) X-SpamScore: -5 X-BigFish: VS-5(z78cMzzz1202hzz8275dhz2dh87h2a8h668h839h65h) X-Spam-TCS-SCL: 4:0 X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPVD:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-FB-DOMAIN-IP-MATCH: fail Received: from mail151-tx2 (localhost.localdomain [127.0.0.1]) by mail151-tx2 (MessageSwitch) id 1316673518376015_16683; Thu, 22 Sep 2011 06:38:38 +0000 (UTC) Received: from TX2EHSMHS047.bigfish.com (unknown [10.9.14.248]) by mail151-tx2.bigfish.com (Postfix) with ESMTP id 5621BED805A; Thu, 22 Sep 2011 06:38:38 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by TX2EHSMHS047.bigfish.com (10.9.99.147) with Microsoft SMTP Server (TLS) id 14.1.225.22; Thu, 22 Sep 2011 06:38:38 +0000 Received: from az33smr02.freescale.net (10.64.34.200) by 039-SN1MMR1-001.039d.mgd.msft.net (10.84.1.13) with Microsoft SMTP Server id 14.1.323.7; Thu, 22 Sep 2011 01:38:37 -0500 Received: from S2100-06.ap.freescale.net (S2100-06.ap.freescale.net [10.192.242.125]) by az33smr02.freescale.net (8.13.1/8.13.0) with ESMTP id p8M6cYtk022544; Thu, 22 Sep 2011 01:38:35 -0500 (CDT) From: Shawn Guo To: Grant Likely CC: , , , Shawn Guo Subject: [PATCH] serial/imx: add of_alias_get_id() reference back Date: Thu, 22 Sep 2011 14:48:13 +0800 Message-ID: <1316674093-14802-1-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <20110921204545.19871.99088.stgit@ponder> References: <20110921204545.19871.99088.stgit@ponder> MIME-Version: 1.0 X-OriginatorOrg: sigmatel.com As of_alias_get_id() gets fixed and ready for use, the patch adds the of_alias_get_id() reference back to imx serial driver. Signed-off-by: Shawn Guo --- drivers/tty/serial/imx.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c index 4a36470..b550cff 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c @@ -1318,17 +1318,22 @@ static int serial_imx_resume(struct platform_device *dev) static int serial_imx_probe_dt(struct imx_port *sport, struct platform_device *pdev) { - static int portnum = 0; struct device_node *np = pdev->dev.of_node; const struct of_device_id *of_id = of_match_device(imx_uart_dt_ids, &pdev->dev); + int ret; if (!np) return -ENODEV; - sport->port.line = portnum++; - if (sport->port.line >= UART_NR) - return -EINVAL; + ret = of_alias_get_id(np, "serial"); + if (ret < 0) { + pr_err("%s: failed to get alias id, errno %d\n", + __func__, ret); + return -ENODEV; + } else { + sport->port.line = ret; + } if (of_get_property(np, "fsl,uart-has-rtscts", NULL)) sport->have_rtscts = 1;