From patchwork Tue Nov 18 23:02:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Ebalard X-Patchwork-Id: 5333631 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 20ECEC11AC for ; Tue, 18 Nov 2014 23:04:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 48AC1201CE for ; Tue, 18 Nov 2014 23:04:05 +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 66F6C2018E for ; Tue, 18 Nov 2014 23:04:04 +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 1Xqrme-0004tB-ON; Tue, 18 Nov 2014 23:02:04 +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 1XqrmY-0004YU-8w for linux-arm-kernel@lists.infradead.org; Tue, 18 Nov 2014 23:01:59 +0000 Received: by smtp.natisbad.org (Postfix, from userid 109) id C8CC717004A8; Wed, 19 Nov 2014 00:01:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1416351696; bh=rZuWCSjZzXp0SdhClPeXpFYdzFNOqIz9ZMbz3YhTPis=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=MSyWTLvQyNtkEv/fnpKBuJ7g9k5wYyUIfOL6qNF/vvQgr9B6KX7ltxSR3LLitetD9 ZZpc+9kdavqPn7Fx16B3J1NKTO4NrGaN4zviV/2hBChV3YpBtQfspD5gQXCNupf4Xn rdR0uBDOSZkMHAdfOQ/quBKfCWuVzxy8yCvvJMDU= 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=unavailable version=3.3.1 Received: from small (localhost [IPv6:::1]) by smtp.natisbad.org (Postfix) with ESMTP id F23031700468; Tue, 18 Nov 2014 23:59:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1416351562; bh=rZuWCSjZzXp0SdhClPeXpFYdzFNOqIz9ZMbz3YhTPis=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=i/DHLWlLyoaj6g7SeiDa17TzyK9kHTru8VXQwBQUK8GEPHKhyfbxkZE7OE8sy0Pbk xyTrbe3H0lRoBP5FzdxusMUYdeL19by1+7XmXUJJQurYDy6/3ZF6YHrWQEyCYUYkx4 QwTbQc34LSWyrzzFtUJeQh+fBmrMojZkCJJY2/qc= X-Hashcash: 1:20:141118:jason@lakedaemon.net::jWxhBzGy1rRmaVWA:000000000000000000000000000000000000000000AEw X-Hashcash: 1:20:141118:andrew@lunn.ch::TWtKgmzaP+GK7pBH:0003whf X-Hashcash: 1:20:141118:gregory.clement@free-electrons.com::nKwV9NxB5/CiXD2A:0000000000000000000000000003vAa X-Hashcash: 1:20:141118:sebastian.hesselbarth@gmail.com::ClR2/6h3U81Q1Sc3:0000000000000000000000000000006u9u X-Hashcash: 1:20:141118:klightspeed@killerwolves.net::erPC+U6xDbZBaZ3r:0000000000000000000000000000000001Kh6 X-Hashcash: 1:20:141118:linux@arm.linux.org.uk::Kpe0L0EE3VdO72QJ:00000000000000000000000000000000000000021Zd X-Hashcash: 1:20:141118:linux-arm-kernel@lists.infradead.org::OI3tj8djTsPpI3fM:00000000000000000000000001rwY X-Hashcash: 1:20:141118:rob.herring@calxeda.com::B+zYStMqokN4x4RN:000000000000000000000000000000000000003B0y X-Hashcash: 1:20:141118:pawel.moll@arm.com::2fmu4q7MQWcOgEbu:0000000000000000000000000000000000000000000JH7i X-Hashcash: 1:20:141118:mark.rutland@arm.com::SR6ab9s+zhLqKZsA:000000000000000000000000000000000000000002YBz X-Hashcash: 1:20:141118:swarren@wwwdotorg.org::0drRowa977NvbR57:0000000000000000000000000000000000000000BFV6 X-Hashcash: 1:20:141118:ijc+devicetree@hellion.org.uk::hBhZ+d8BRboUKQCC:0000000000000000000000000000000090Tr X-Hashcash: 1:20:141118:devicetree@vger.kernel.org::Agw9vdVhcVk1sXaT:000000000000000000000000000000000000n+M From: Arnaud Ebalard To: Jason Cooper , Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Ben Peddell Subject: [PATCHv4 08/10] arm: mvebu: define and use common Armada XP SPI pinctrl setting In-Reply-To: References: Message-Id: <3761645880ae430085b041ed2d4287e374ccd300.1416351426.git.arno@natisbad.org> Date: Wed, 19 Nov 2014 00:02:43 +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_150158_585485_59A0910D X-CRM114-Status: GOOD ( 12.01 ) 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 XP pinctrl settings in armada-xp.dtsi for the supported SPI interface (MPP36-39) and use it as default for Armada XP spi interface. That being done, it removes the now redundant definitions in armada-xp-axpwifiap.dts. Note: this patch has the potential to break out-of-tree users w/o specific pinctrl settings for their spi interfaces if the default above does not match their config (i.e. if they do not use CS0). Signed-off-by: Arnaud Ebalard --- arch/arm/boot/dts/armada-xp-axpwifiap.dts | 7 ------- arch/arm/boot/dts/armada-xp.dtsi | 11 +++++++++++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/arch/arm/boot/dts/armada-xp-axpwifiap.dts b/arch/arm/boot/dts/armada-xp-axpwifiap.dts index 0e53fad111de..c9d25bdbe795 100644 --- a/arch/arm/boot/dts/armada-xp-axpwifiap.dts +++ b/arch/arm/boot/dts/armada-xp-axpwifiap.dts @@ -100,8 +100,6 @@ spi0: spi@10600 { status = "okay"; - pinctrl-0 = <&pmx_spi>; - pinctrl-names = "default"; spi-flash@0 { #address-cells = <1>; @@ -138,11 +136,6 @@ marvell,function = "gpio"; }; - pmx_spi: pmx-spi { - marvell,pins = "mpp36", "mpp37", "mpp38", "mpp39"; - marvell,function = "spi"; - }; - pmx_phy_int: pmx-phy-int { marvell,pins = "mpp32"; marvell,function = "gpio"; diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi index acb236909649..d095606466ad 100644 --- a/arch/arm/boot/dts/armada-xp.dtsi +++ b/arch/arm/boot/dts/armada-xp.dtsi @@ -53,6 +53,11 @@ reg = <0x11100 0x100>; }; + spi0: spi@10600 { + pinctrl-0 = <&spi0_pins>; + pinctrl-names = "default"; + }; + uart2: serial@12200 { compatible = "snps,dw-apb-uart"; pinctrl-0 = <&uart2_pins>; @@ -240,6 +245,12 @@ marvell,function = "sd0"; }; + spi0_pins: spi0-pins { + marvell,pins = "mpp36", "mpp37", + "mpp38", "mpp39"; + marvell,function = "spi"; + }; + uart2_pins: uart2-pins { marvell,pins = "mpp42", "mpp43"; marvell,function = "uart2";