From patchwork Fri Nov 21 19:45:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Ebalard X-Patchwork-Id: 5357701 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 55CF3C11AC for ; Fri, 21 Nov 2014 19:48:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 79627200E6 for ; Fri, 21 Nov 2014 19:48:48 +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 A28BA200D9 for ; Fri, 21 Nov 2014 19:48:47 +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 1Xru9i-00005P-DY; Fri, 21 Nov 2014 19:46:10 +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 1Xru8m-0006Yt-Dr for linux-arm-kernel@lists.infradead.org; Fri, 21 Nov 2014 19:45:13 +0000 Received: by smtp.natisbad.org (Postfix, from userid 109) id 01FEC1700D75; Fri, 21 Nov 2014 20:44:28 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1416599069; bh=TVQGRIZDgGXrxWLPrj6GWkDX4H/wDhY/NJiRjeFYae4=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=2MKWoJ3/QMKYAxo6Fv5UKIb6RUVNh2Oe1uMDQ9b4qXNnUVXeDw3Z/SRleBolSMjuQ 2RlsasUdK5Z2UNPu25Fnv3Zz1EsgwgSDjgQOBOYplkLNyaMS6E43+gJp3GxjnO7pG4 XZyEl8jpFhDKbRk3CpZpdHhasbAtBT7E/oNbX5i8= 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 9403C1700508; Fri, 21 Nov 2014 20:42:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1416598942; bh=TVQGRIZDgGXrxWLPrj6GWkDX4H/wDhY/NJiRjeFYae4=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=cHTBkX2hzcWI1OlyBxEyK6cSDGq+W2I0MLiUXmB5azMjkP8CImbEXLr1sJF1S8x+c YmpTs6Xd7/ewBgnWulCUK3N5co5xMDd0y1XwQ84caUn+Ph9Moieea+0wO0v5I/q1iQ OBzFQwWmzqp7IpG3BNsJZC3dhBELP4mMTxS4soto= X-Hashcash: 1:20:141121:jason@lakedaemon.net::/q1lougbPxc7J1sE:000000000000000000000000000000000000000004/sc X-Hashcash: 1:20:141121:andrew@lunn.ch::qmPSMxPhFYpdtUCO:000222h X-Hashcash: 1:20:141121:gregory.clement@free-electrons.com::gzmJNiBLXC5XpCNM:000000000000000000000000000717N X-Hashcash: 1:20:141121:sebastian.hesselbarth@gmail.com::kdiSDHYMYKyhYy7p:000000000000000000000000000000RGsK X-Hashcash: 1:20:141121:klightspeed@killerwolves.net::6yf6zJyIdCR7iEfz:00000000000000000000000000000000018vF X-Hashcash: 1:20:141121:linux@arm.linux.org.uk::c43VDCS7LvcsYBXe:0000000000000000000000000000000000000006RV/ X-Hashcash: 1:20:141121:linux-arm-kernel@lists.infradead.org::rk14XjNN2uv9osvK:00000000000000000000000004vjd X-Hashcash: 1:20:141121:rob.herring@calxeda.com::qYghX5bXhiRAAV05:000000000000000000000000000000000000005mSy X-Hashcash: 1:20:141121:pawel.moll@arm.com::weXuDqnRPbdSwfdW:00000000000000000000000000000000000000000000wA9 X-Hashcash: 1:20:141121:mark.rutland@arm.com::xXHCAzWN2WygasXU:000000000000000000000000000000000000000002nn/ X-Hashcash: 1:20:141121:swarren@wwwdotorg.org::hUAETDfTCq8rJX1Z:00000000000000000000000000000000000000000WY6 X-Hashcash: 1:20:141121:ijc+devicetree@hellion.org.uk::vR6y8tDwTjNXa5zv:000000000000000000000000000000006EZF X-Hashcash: 1:20:141121:devicetree@vger.kernel.org::ftC/wbQvZY63CY5H:000000000000000000000000000000000002DyO From: Arnaud Ebalard To: Jason Cooper , Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Ben Peddell Subject: [PATCHv5 06/10] arm: mvebu: define and use common Armada 370 UART pinctrl settings In-Reply-To: References: Message-Id: <455f2c2ebd8075c43f1fe60b99de10160310f780.1416598537.git.arno@natisbad.org> Date: Fri, 21 Nov 2014 20:45:53 +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_114512_842137_E4B12A30 X-CRM114-Status: GOOD ( 10.55 ) 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";