From patchwork Mon Nov 17 23:27:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Ebalard X-Patchwork-Id: 5324451 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3BE0AC11AC for ; Mon, 17 Nov 2014 23:29:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5A5C020125 for ; Mon, 17 Nov 2014 23:29:27 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6A85F20120 for ; Mon, 17 Nov 2014 23:29:26 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XqVhF-0003OL-Jb; Mon, 17 Nov 2014 23:27:01 +0000 Received: from 36.223.133.77.rev.sfr.net ([77.133.223.36] helo=smtp.natisbad.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XqVgm-0002lP-O8 for linux-arm-kernel@lists.infradead.org; Mon, 17 Nov 2014 23:26:33 +0000 Received: by smtp.natisbad.org (Postfix, from userid 109) id 1D97617004A8; Tue, 18 Nov 2014 00:26:09 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1416266770; bh=JuuM4noRFVMCIZtmRQhJKEBCYhyHK7qIbARoeCwc9j0=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=L5sQhEmClcxIojJ5QSlbPmQTct0BB/r13OL65uN3rEgrEvutqcTMmmeP6YZmhzuqu CgQ6sdqe+V700dh09YeNPlBV4YLlQvoIEbDd0nAg52/9Lyod1iwL5sPbRAZSdQjf6J 281IriOQ9LhXzI0sTO1mZRqFga4n1c/YUAc5RUjA= X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_LOW, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from small (localhost [IPv6:::1]) by smtp.natisbad.org (Postfix) with ESMTP id 163531700D4D; Tue, 18 Nov 2014 00:24:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1416266670; bh=JuuM4noRFVMCIZtmRQhJKEBCYhyHK7qIbARoeCwc9j0=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=NPOl7VtsSGKUzGQUa1cHt9P4pU+UfJ3Z+8kGcwHmtL5V2wwCqseCCnmMYxQewVo/9 NH72x6tY6JAGbe47W6SY0iuD5s2AMFP2Rvrnw+jtFRzuqdrzAK4vIUtB2oDIIAZmpR MIFkpVI48jurcMc6E2FxL+QwT/jYYZGMKS2sH8nA= X-Hashcash: 1:20:141117:jason@lakedaemon.net::DlShKk6wimB8b9Y2:0000000000000000000000000000000000000000048Z3 X-Hashcash: 1:20:141117:andrew@lunn.ch::jcVOIbt8/RHj+mci:0000Kd7 X-Hashcash: 1:20:141117:gregory.clement@free-electrons.com::8BeNqL8fe2HOtyy9:00000000000000000000000000054rW X-Hashcash: 1:20:141117:sebastian.hesselbarth@gmail.com::t6lQzR8CIqp3vapa:00000000000000000000000000000005Mo X-Hashcash: 1:20:141117:klightspeed@killerwolves.net::BIZjeedYV5Re2get:0000000000000000000000000000000002nAG X-Hashcash: 1:20:141117:linux@arm.linux.org.uk::QCObOVJJ155gzS/H:000000000000000000000000000000000000000ERpq X-Hashcash: 1:20:141117:linux-arm-kernel@lists.infradead.org::HKDmWaHxNDTSr6Zo:00000000000000000000000000XOQ X-Hashcash: 1:20:141117:rob.herring@calxeda.com::snn5jahfPODmKHIL:000000000000000000000000000000000000006G4B X-Hashcash: 1:20:141117:pawel.moll@arm.com::OAWv8wCMbAbLjkpM:00000000000000000000000000000000000000000005EdU X-Hashcash: 1:20:141117:mark.rutland@arm.com::zmoIkjEQEp9rN366:000000000000000000000000000000000000000004hic X-Hashcash: 1:20:141117:swarren@wwwdotorg.org::es8XaFIEjsPZENUz:00000000000000000000000000000000000000003KMf X-Hashcash: 1:20:141117:ijc+devicetree@hellion.org.uk::ImS/IxYxABk6Xe3c:000000000000000000000000000000000V93 X-Hashcash: 1:20:141117:devicetree@vger.kernel.org::SbcHr95uT+mO1dTM:000000000000000000000000000000000004Ac/ From: Arnaud Ebalard To: Jason Cooper , Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Ben Peddell Subject: [PATCHv3 07/12] arm: mvebu: define and use common Armada 370 UART pinctrl settings In-Reply-To: References: Message-Id: Date: Tue, 18 Nov 2014 00:27:51 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141117_152633_148383_C43BB39F X-CRM114-Status: GOOD ( 10.88 ) X-Spam-Score: 0.3 (/) Cc: Mark Rutland , devicetree@vger.kernel.org, Russell King , Pawel Moll , Stephen Warren , Ian Campbell , Rob Herring , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This patch defines common Armada 370 pinctrl settings for uart0 and uart1 interfaces: uart0: MPP0-1 as default uart1: MPP41-42 as default Note: this patch has the potential to break out-of-tree users w/o specific pinctrl settings for their uart interfaces if the default above does not match their config. Suggested-by: Andrew Lunn Signed-off-by: Arnaud Ebalard --- arch/arm/boot/dts/armada-370.dtsi | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi index 901806f35f40..84ab0f23b857 100644 --- a/arch/arm/boot/dts/armada-370.dtsi +++ b/arch/arm/boot/dts/armada-370.dtsi @@ -126,6 +126,16 @@ marvell,function = "spi0"; }; + uart0_pins: uart0-pins { + marvell,pins = "mpp0", "mpp1"; + marvell,function = "uart0"; + }; + + uart1_pins: uart1-pins { + marvell,pins = "mpp41", "mpp42"; + marvell,function = "uart1"; + }; + spi1_pins: spi1-pins { marvell,pins = "mpp49", "mpp50", "mpp51", "mpp52"; @@ -288,6 +298,21 @@ pinctrl-names = "default"; }; + /* + * Default UART pinctrl setting without RTS/CTS, can + * be overwritten on board level if a different + * configuration is used. + */ + uart0: serial@12000 { + pinctrl-0 = <&uart0_pins>; + pinctrl-names = "default"; + }; + + uart1: serial@12100 { + pinctrl-0 = <&uart1_pins>; + pinctrl-names = "default"; + }; + usb@50000 { clocks = <&coreclk 0>; };