From patchwork Thu Nov 15 08:36:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 1747581 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 D5F4EDF2AB for ; Thu, 15 Nov 2012 08:42:46 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TYuzI-0004r1-4N; Thu, 15 Nov 2012 08:39:53 +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 1TYuxM-0003ri-H2 for linux-arm-kernel@lists.infradead.org; Thu, 15 Nov 2012 08:37:53 +0000 Received: by mail-da0-f49.google.com with SMTP id q27so542193daj.36 for ; Thu, 15 Nov 2012 00:37:50 -0800 (PST) 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=DFgJXryqcoEZFddWccyHNKpXeesfop6jlpkVWwB2hd4Gk4x9yc2LweXSVSv8kcmNGy pg01ZxpiZh7i2orcnq74Mtc9CeQFWOuzpUr0WluJzLq4kuHW6LJJOfgWqk9Z9v06cUq7 lkaRDmJJxM+cJorhaQe1IkjSMt4x6yJlICW9RwqcRaHl7PEtTw7ITjYvSrErFVowq7Cl qe30capSL1Jz8l39UYDAbD/FjCj+EMIne6j1/8kaId1t4BcwRuTfd7pgVlYKhk5hEf0y V0v355PkzHY9tYYIlnjMPs82GmlmwxwFW3DTrOuMTNGPmOnuR6HA2/NclvP5UZnh00Y3 eYbA== Received: by 10.68.252.168 with SMTP id zt8mr2586177pbc.43.1352968670879; Thu, 15 Nov 2012 00:37:50 -0800 (PST) Received: from localhost.localdomain ([174.139.116.75]) by mx.google.com with ESMTPS id ok8sm9176554pbb.42.2012.11.15.00.37.46 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 15 Nov 2012 00:37:49 -0800 (PST) From: Haojian Zhuang To: linus.walleij@linaro.org, tony@atomide.com, swarren@wwwdotorg.org, linux-arm-kernel@lists.infradead.org, arnd@arndb.de Subject: [PATCH v5 08/10] tty: pxa: configure pin Date: Thu, 15 Nov 2012 16:36:37 +0800 Message-Id: <1352968600-15345-9-git-send-email-haojian.zhuang@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1352968600-15345-1-git-send-email-haojian.zhuang@gmail.com> References: <1352968600-15345-1-git-send-email-haojian.zhuang@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121115_033753_103284_3CAF335F X-CRM114-Status: GOOD ( 14.06 ) 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);