From patchwork Wed Oct 31 23:04:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 1682321 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 888F2DFB80 for ; Wed, 31 Oct 2012 23:09:16 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TThMM-0000WC-BI; Wed, 31 Oct 2012 23:06:08 +0000 Received: from mail-da0-f49.google.com ([209.85.210.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TThLH-00007E-U8 for linux-arm-kernel@lists.infradead.org; Wed, 31 Oct 2012 23:05:01 +0000 Received: by mail-da0-f49.google.com with SMTP id q27so800533daj.36 for ; Wed, 31 Oct 2012 16:04:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=ngs0TVLgdt3CC7LWI4oZP+Zd9gTOIA/rUrgyDxpPta4=; b=cnwmVyztoozq3pq7asi0l+kKN/NhQ4K6IfbFPIZyxWK6FO+6FOEGYacdDwQmoekTl0 6CNDSON7CxmtDSQB/3mf/KLTjSsH6qd03ZL82Aw71tbJfnSqOEPR7Mxb/9pI9DoWlpcQ aa8IgTqUi63eNYf1diklc5JiuE4VOpg4/KWazJ07T1p7fdHvUBh22sWeIItI7+Fccf7X 1naYtH5b7c3l3QDVy6dTVidNWMQIKN/y2ywGOAq2PFTxSDsP1/BMTiweq+k3stCpThoB yojcvwc/kPVYgBi//qp3kIxLDQkx8FZsuP3V4UMzhYcS5q4ZMD1jMu+qh3MPnCghqUtr TEBQ== Received: by 10.66.75.165 with SMTP id d5mr106014666paw.39.1351724698403; Wed, 31 Oct 2012 16:04:58 -0700 (PDT) Received: from localhost ([61.172.13.185]) by mx.google.com with ESMTPS id mn5sm2960575pbc.12.2012.10.31.16.04.54 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 31 Oct 2012 16:04:57 -0700 (PDT) From: Haojian Zhuang To: swarren@wwwdotorg.org, linux-arm-kernel@lists.infradead.org, arnd@arndb.de, tony@atomide.com, devicetree-discuss@lists.org, linus.walleij@linaro.org Subject: [PATCH v3 6/9] tty: pxa: configure pin Date: Thu, 1 Nov 2012 07:04:18 +0800 Message-Id: <1351724661-29050-7-git-send-email-haojian.zhuang@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1351724661-29050-1-git-send-email-haojian.zhuang@gmail.com> References: <1351724661-29050-1-git-send-email-haojian.zhuang@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121031_190500_226741_A5C263DC X-CRM114-Status: GOOD ( 14.07 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.210.49 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (haojian.zhuang[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Haojian Zhuang X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Configure pins by pinctrl driver. Signed-off-by: Haojian Zhuang Acked-by: Linus Walleij --- drivers/tty/serial/pxa.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/tty/serial/pxa.c b/drivers/tty/serial/pxa.c index 9033fc6..02dc771 100644 --- a/drivers/tty/serial/pxa.c +++ b/drivers/tty/serial/pxa.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -809,6 +810,7 @@ static int serial_pxa_probe_dt(struct platform_device *pdev, struct uart_pxa_port *sport) { struct device_node *np = pdev->dev.of_node; + struct pinctrl *pinctrl; int ret; if (!np) @@ -819,6 +821,10 @@ static int serial_pxa_probe_dt(struct platform_device *pdev, dev_err(&pdev->dev, "failed to get alias id, errno %d\n", ret); return ret; } + pinctrl = devm_pinctrl_get_select_default(&pdev->dev); + if (IS_ERR(pinctrl)) + return -EPROBE_DEFER; + sport->port.line = ret; return 0; } @@ -857,7 +863,7 @@ static int serial_pxa_probe(struct platform_device *dev) ret = serial_pxa_probe_dt(dev, sport); if (ret > 0) sport->port.line = dev->id; - else if (ret < 0) + if (ret < 0) goto err_clk; snprintf(sport->name, PXA_NAME_LEN - 1, "UART%d", sport->port.line + 1);