From patchwork Fri Nov 21 23:46:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Ebalard X-Patchwork-Id: 5358601 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 5F74DC11AC for ; Fri, 21 Nov 2014 23:48:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7D98B2015D for ; Fri, 21 Nov 2014 23:48:30 +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 A8A1620154 for ; Fri, 21 Nov 2014 23:48:29 +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 1Xrxtn-0006u4-Ht; Fri, 21 Nov 2014 23:45:59 +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 1XrxtP-0006VE-J2 for linux-arm-kernel@lists.infradead.org; Fri, 21 Nov 2014 23:45:36 +0000 Received: by smtp.natisbad.org (Postfix, from userid 109) id 717911700D4B; Sat, 22 Nov 2014 00:44:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1416613491; bh=SuckbkOOkIkCTznDFtyRrViNK+xFjKTVivXhbS1d+6k=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=xpqpR1Aw0GPgnF/oE2WssAPeTFe/GxrSpLHlm5FpMWWan2CtS2RslvuC7Ez6Vwtru 62A79ajo48TVdlNkeQ1Wq9BIjMZSKoXVl7rBKFiqJtMLxCMxU1VQKdgudrFZlbFJeA NCWVHLrZpVHZK0rsLiYyx+jr0mbKPOw9yBkEQaUE= 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 644751700458; Sat, 22 Nov 2014 00:42:54 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1416613374; bh=SuckbkOOkIkCTznDFtyRrViNK+xFjKTVivXhbS1d+6k=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=qv3gbcQP2EiHo/b6A8BFuKTi+ztoMANPWp7qmePDorxGQ6CqcKUmgGs0aDpYVcCHn GRNsm9JB9En+LQDU7iaaVSSwwDKxrLg1v/lJGHMp3RBnHmwEdalEsdKnza2xg6/jrJ 2EeBrLuF3LeLP2+59X3jsrP8riojo9NelJ/qb0vc= X-Hashcash: 1:20:141121:jason@lakedaemon.net::/WCI++J3n5lB5Gvf:000000000000000000000000000000000000000001j66 X-Hashcash: 1:20:141121:andrew@lunn.ch::0LqINjHG+8hquAxo:0004GGa X-Hashcash: 1:20:141121:gregory.clement@free-electrons.com::WNElrvsMoWVPmBc/:0000000000000000000000000001Ujn X-Hashcash: 1:20:141121:sebastian.hesselbarth@gmail.com::671nFWgOFkeq7zJv:0000000000000000000000000000001LX6 X-Hashcash: 1:20:141121:klightspeed@killerwolves.net::Rpty/daYVjs8UGv+:00000000000000000000000000000000023uY X-Hashcash: 1:20:141121:linux@arm.linux.org.uk::keveDD3HxFSKtLp7:0000000000000000000000000000000000000000j8G X-Hashcash: 1:20:141121:linux-arm-kernel@lists.infradead.org::fOwwrPwYkq3+hHlP:00000000000000000000000001KZE X-Hashcash: 1:20:141121:rob.herring@calxeda.com::hZQdSeSSyZqqZ6qi:000000000000000000000000000000000000000frC X-Hashcash: 1:20:141121:pawel.moll@arm.com::PaNTU2eqhzzX2rH2:00000000000000000000000000000000000000000000SoI X-Hashcash: 1:20:141121:mark.rutland@arm.com::83054672VwJ30BF7:000000000000000000000000000000000000000003pIZ X-Hashcash: 1:20:141121:swarren@wwwdotorg.org::ax38dR1AKMF5u56Y:00000000000000000000000000000000000000001EIV X-Hashcash: 1:20:141121:ijc+devicetree@hellion.org.uk::5VlVwBCGaMIjYQw+:000000000000000000000000000000005YOE X-Hashcash: 1:20:141121:devicetree@vger.kernel.org::wL49bZ0GKv/CMU9c:000000000000000000000000000000000000f17 From: Arnaud Ebalard To: Jason Cooper , Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Ben Peddell Subject: [PATCHv6 06/10] arm: mvebu: define and use common Armada 370 UART pinctrl settings In-Reply-To: References: Message-Id: <31412e57955c98bc9cc47b70726b5072af945cc3.1416613429.git.arno@natisbad.org> Date: Sat, 22 Nov 2014 00:46:18 +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-20141121_154535_970190_42EBA71B X-CRM114-Status: GOOD ( 10.26 ) 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 Acked-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 f1227c53e92d..fbd835a3c62c 100644 --- a/arch/arm/boot/dts/armada-370.dtsi +++ b/arch/arm/boot/dts/armada-370.dtsi @@ -121,6 +121,21 @@ reg = <0x11100 0x20>; }; + /* + * 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"; + }; + system-controller@18200 { compatible = "marvell,armada-370-xp-system-controller"; reg = <0x18200 0x100>; @@ -281,6 +296,16 @@ marvell,function = "spi1"; }; + uart0_pins: uart0-pins { + marvell,pins = "mpp0", "mpp1"; + marvell,function = "uart0"; + }; + + uart1_pins: uart1-pins { + marvell,pins = "mpp41", "mpp42"; + marvell,function = "uart1"; + }; + sdio_pins1: sdio-pins1 { marvell,pins = "mpp9", "mpp11", "mpp12", "mpp13", "mpp14", "mpp15";