From patchwork Wed Dec 19 20:18:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 1897011 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 D0EDDDF215 for ; Wed, 19 Dec 2012 20:22:23 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TlQ6x-0000qf-IK; Wed, 19 Dec 2012 20:19:27 +0000 Received: from mail.free-electrons.com ([94.23.32.191]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TlQ6I-0000jN-N1 for linux-arm-kernel@lists.infradead.org; Wed, 19 Dec 2012 20:18:48 +0000 Received: by mail.free-electrons.com (Postfix, from userid 106) id D76AB1C3; Wed, 19 Dec 2012 21:18:46 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-3.2 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 shortcircuit=no autolearn=ham version=3.3.1 Received: from localhost (gar31-2-82-226-185-134.fbx.proxad.net [82.226.185.134]) by mail.free-electrons.com (Postfix) with ESMTPSA id A2080196; Wed, 19 Dec 2012 21:18:38 +0100 (CET) From: Maxime Ripard To: Arnd Bergmann , Olof Johansson Subject: [PATCH 5/6] tty: of_serial: Add pinctrl support Date: Wed, 19 Dec 2012 21:18:14 +0100 Message-Id: <1355948295-19680-6-git-send-email-maxime.ripard@free-electrons.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1355948295-19680-1-git-send-email-maxime.ripard@free-electrons.com> References: <1355948295-19680-1-git-send-email-maxime.ripard@free-electrons.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121219_151847_051070_AEFD96D3 X-CRM114-Status: GOOD ( 12.87 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Alejandro Mery , Greg Kroah-Hartman , linux-serial@vger.kernel.org, Stefan Roese , linux-arm-kernel@lists.infradead.org, Alan Cox 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 Use pinctrl to configure the SoCs pins directly from the driver. Signed-off-by: Maxime Ripard Cc: Alan Cox Cc: Greg Kroah-Hartman Cc: linux-serial@vger.kernel.org --- drivers/tty/serial/of_serial.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/tty/serial/of_serial.c b/drivers/tty/serial/of_serial.c index df443b9..f66bdab 100644 --- a/drivers/tty/serial/of_serial.c +++ b/drivers/tty/serial/of_serial.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -54,6 +55,7 @@ static int __devinit of_platform_serial_setup(struct platform_device *ofdev, int type, struct uart_port *port) { struct resource resource; + struct pinctrl *pinctrl; struct device_node *np = ofdev->dev.of_node; u32 clk, spd, prop; int ret; @@ -73,6 +75,11 @@ static int __devinit of_platform_serial_setup(struct platform_device *ofdev, return ret; } + pinctrl = devm_pinctrl_get_select_default(&ofdev->dev); + if (IS_ERR(pinctrl)) + dev_warn(&ofdev->dev, + "pins are not configured from the driver\n"); + spin_lock_init(&port->lock); port->mapbase = resource.start;