From patchwork Thu Oct 18 09:06:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 1608691 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id A07643FE36 for ; Thu, 18 Oct 2012 09:08:37 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TOm3y-0001Sc-Na; Thu, 18 Oct 2012 09:06:46 +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 1TOm3k-0001MV-Mp for linux-arm-kernel@lists.infradead.org; Thu, 18 Oct 2012 09:06:33 +0000 Received: by mail-da0-f49.google.com with SMTP id q27so3508588daj.36 for ; Thu, 18 Oct 2012 02:06:32 -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=tOyM1yWLDjG9NJ4Bv/EtfmnSYgReq9WbQ28K9m8fbHc=; b=SKRzgQStIfomhZGUtb6cp0VB8MHs9MC6eTaC8+qKQXUsX0aSZXGC3e+bnipfsfgLA+ F2cL+1RarR9bqiMRDu/y9Or+t1Md/YK21Q2xD4YYXHaSQlfdrW97bXX2e3+8+/arRqaX q/Sp25lFpZVHCHwZJXOkFNJpBTaT+v7zligGoFd3Pj4mnmCc7eQqGmfgvXmAxbTTZzfa mFAUVsbj7mG8tKkPr+T6or5H+WO9l2wK+woG3knKd+9FiZoYaeFqJR2+vVeP33mlichz sX0Kw0HYcDGQMsAmlOn5p9rBe9RLCTh8dNmUVvGHTyNHgREjVES5yvGQbhTxaqTONAiT w5Nw== Received: by 10.68.225.5 with SMTP id rg5mr63363409pbc.73.1350551192430; Thu, 18 Oct 2012 02:06:32 -0700 (PDT) Received: from localhost ([58.39.221.134]) by mx.google.com with ESMTPS id jw14sm13939044pbb.36.2012.10.18.02.06.28 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 18 Oct 2012 02:06:31 -0700 (PDT) From: Haojian Zhuang To: linux-arm-kernel@lists.infradead.org, arnd@arndb.de, linus.walleij@linaro.org, tony@atomide.com, devicetree-discuss@lists.ozlabs.org Subject: [PATCH 03/10] tty: pxa: configure pin Date: Thu, 18 Oct 2012 17:06:57 +0800 Message-Id: <1350551224-12857-3-git-send-email-haojian.zhuang@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1350551224-12857-1-git-send-email-haojian.zhuang@gmail.com> References: <1350551224-12857-1-git-send-email-haojian.zhuang@gmail.com> X-Spam-Note: CRM114 invocation failed 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 files changed, 8 insertions(+), 0 deletions(-) diff --git a/drivers/tty/serial/pxa.c b/drivers/tty/serial/pxa.c index 5847a4b..ee6118a 100644 --- a/drivers/tty/serial/pxa.c +++ b/drivers/tty/serial/pxa.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -795,6 +796,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) @@ -805,6 +807,12 @@ 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)) { + ret = PTR_ERR(pinctrl); + return ret; + } + sport->port.line = ret; return 0; }