From patchwork Tue Nov 18 23:02:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Ebalard X-Patchwork-Id: 5333621 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 1F00BC11AC for ; Tue, 18 Nov 2014 23:03:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4DD37201E4 for ; Tue, 18 Nov 2014 23:03:32 +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 72A4E201CE for ; Tue, 18 Nov 2014 23:03:31 +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 1Xqrm8-0004TG-HA; Tue, 18 Nov 2014 23:01:32 +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 1Xqrlw-00049Y-NQ for linux-arm-kernel@lists.infradead.org; Tue, 18 Nov 2014 23:01:21 +0000 Received: by smtp.natisbad.org (Postfix, from userid 109) id E8E77170073C; Wed, 19 Nov 2014 00:01:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1416351661; bh=TVQGRIZDgGXrxWLPrj6GWkDX4H/wDhY/NJiRjeFYae4=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=VrRt6s4xrLTBVrckPk6eJTG2B2JHMuAcT2nBIZSNX+fpK/ZB/CzAlrxrZatAJcbLE PrtW7W7WXHCs5FiaR8IWvQ+tzGLYN9A2nG9eyNtHiK5XP/ppffzfrmNelpMYny9SOW OoDkk3kzprrb+RFtFnTbk9X9Eqp8KMBZyQUiG8HM= 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 83BDB17004FB; Tue, 18 Nov 2014 23:59:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1416351545; bh=TVQGRIZDgGXrxWLPrj6GWkDX4H/wDhY/NJiRjeFYae4=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=VFvNxWJrIL/rcjt7aCGl+mJxsApKNmfCqeRgZ8tW0eKyZ52/U49g13JXV7QpNzrmD OJz1srxflqmykUIuH3ZZ20DXUP5XHZ3VFIlxFO3GStw2C4QasNz/Pm0ci9lvSNWQYn yKuQLISRs7dBZvFVPNfM4x9Q2WTM29681A2PBdNo= X-Hashcash: 1:20:141118:jason@lakedaemon.net::77/FFWawQQRqDyZc:000000000000000000000000000000000000000000JgJ X-Hashcash: 1:20:141118:andrew@lunn.ch::RZkSXr5c3X5OH0QF:0001V/T X-Hashcash: 1:20:141118:gregory.clement@free-electrons.com::Zp6pUdKg573Rq8gR:0000000000000000000000000004bp+ X-Hashcash: 1:20:141118:sebastian.hesselbarth@gmail.com::0AltmkYHVp7kLTQN:0000000000000000000000000000006jlg X-Hashcash: 1:20:141118:klightspeed@killerwolves.net::Siqkhhhg0CGfaPkF:0000000000000000000000000000000000xya X-Hashcash: 1:20:141118:linux@arm.linux.org.uk::YjiIRiUq1f5CBNPD:0000000000000000000000000000000000000006lE/ X-Hashcash: 1:20:141118:linux-arm-kernel@lists.infradead.org::c645vkuklWP+Rx1L:000000000000000000000000010iB X-Hashcash: 1:20:141118:rob.herring@calxeda.com::xmsKCXtXNROgAATG:000000000000000000000000000000000000000Jld X-Hashcash: 1:20:141118:pawel.moll@arm.com::lDBG3mXg/mnmUXHN:000000000000000000000000000000000000000000030eZ X-Hashcash: 1:20:141118:mark.rutland@arm.com::jdv92BHu4C4dOebh:00000000000000000000000000000000000000000143h X-Hashcash: 1:20:141118:swarren@wwwdotorg.org::5QcP2ZVj6smtVviI:00000000000000000000000000000000000000003FTc X-Hashcash: 1:20:141118:ijc+devicetree@hellion.org.uk::tg6lmVbWd6G4CLX6:000000000000000000000000000000005nsG X-Hashcash: 1:20:141118:devicetree@vger.kernel.org::raM6Md9qSk91bO3U:000000000000000000000000000000000008+YU From: Arnaud Ebalard To: Jason Cooper , Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Ben Peddell Subject: [PATCHv4 06/10] arm: mvebu: define and use common Armada 370 UART pinctrl settings In-Reply-To: References: Message-Id: Date: Wed, 19 Nov 2014 00:02:27 +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-20141118_150121_083282_F51B5386 X-CRM114-Status: GOOD ( 10.98 ) 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 f1284ae0cddd..b8de32b2a265 100644 --- a/arch/arm/boot/dts/armada-370.dtsi +++ b/arch/arm/boot/dts/armada-370.dtsi @@ -211,6 +211,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>; }; @@ -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";