From patchwork Fri Nov 21 23:46:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Ebalard X-Patchwork-Id: 5358621 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4A4099F2F1 for ; Fri, 21 Nov 2014 23:49:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7F5692015D for ; Fri, 21 Nov 2014 23:49:31 +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 A40DE20154 for ; Fri, 21 Nov 2014 23:49:30 +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 1Xrxuk-0007ZZ-2b; Fri, 21 Nov 2014 23:46:58 +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 1Xrxte-0006fR-Dr for linux-arm-kernel@lists.infradead.org; Fri, 21 Nov 2014 23:45:51 +0000 Received: by smtp.natisbad.org (Postfix, from userid 109) id BED4F1700D4F; Sat, 22 Nov 2014 00:45:28 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1416613528; bh=yySjNd6JQpjlbcfd/kF3ZBm0foluVKaGXvPOTznTfD8=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=d32neZMUZ4QTn1U5nXRDqbYslnk6ZMLxgqpJGwcySC7NrQO27JCi4luLcrStDrZ7C 1t8SlLLwPYtISGDyZOEVpkvOFPPn5esw1oXVnXlsSE8q2AbWS1CGduPqV7iPnpAarX RxoXB++OTc0fVx3iBxmPm861AStqp4w6XlZX4YRo= 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 5C0841700516; Sat, 22 Nov 2014 00:43:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1416613395; bh=yySjNd6JQpjlbcfd/kF3ZBm0foluVKaGXvPOTznTfD8=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=H58nCZESKfQZABqfBBv23vpnezYqXCy3Pl0MkStGjC72imHx5A+ogktp+F+SZXJva Cf0pikBUKSY+A6fzJgRFRic84GLBvqy2HDn5nlTIgUxXMMlb9MoA8Li7w1j9X6xIFt +aWIGbMQflz5BH+nusXLWo+kXSXfZ0YMN46DT64w= X-Hashcash: 1:20:141121:jason@lakedaemon.net::nuZgUUGjxUo/BNVj:000000000000000000000000000000000000000003+Vm X-Hashcash: 1:20:141121:andrew@lunn.ch::RVJ/fnI8guEjd17z:000FmOU X-Hashcash: 1:20:141121:gregory.clement@free-electrons.com::jL1qUw3vk30aA03T:0000000000000000000000000000ssg X-Hashcash: 1:20:141121:sebastian.hesselbarth@gmail.com::klfSzfhYsquSd29Q:0000000000000000000000000000001Mdl X-Hashcash: 1:20:141121:klightspeed@killerwolves.net::eSOpLOt4cQJbrfV/:0000000000000000000000000000000001GYS X-Hashcash: 1:20:141121:linux@arm.linux.org.uk::qlOve6oDfxPrjt/0:00000000000000000000000000000000000000033Sl X-Hashcash: 1:20:141121:linux-arm-kernel@lists.infradead.org::6ZmOJEgXsZ1ShE+d:00000000000000000000000005JcP X-Hashcash: 1:20:141121:rob.herring@calxeda.com::DJo02JnfxVZ0jV4V:000000000000000000000000000000000000000euR X-Hashcash: 1:20:141121:pawel.moll@arm.com::ei7Fd4piTvNThHIr:00000000000000000000000000000000000000000001WQ/ X-Hashcash: 1:20:141121:mark.rutland@arm.com::VHgprx50CDgvo1FZ:000000000000000000000000000000000000000003Bmw X-Hashcash: 1:20:141121:swarren@wwwdotorg.org::/Oky4rww3qoPxYHe:00000000000000000000000000000000000000009W5N X-Hashcash: 1:20:141121:ijc+devicetree@hellion.org.uk::Ooqsv7m4apscPV+g:00000000000000000000000000000000D5sN X-Hashcash: 1:20:141121:devicetree@vger.kernel.org::UuXjEyykZegtUl5e:000000000000000000000000000000000000W+B From: Arnaud Ebalard To: Jason Cooper , Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Ben Peddell Subject: [PATCHv6 08/10] arm: mvebu: define and use common Armada XP SPI pinctrl setting In-Reply-To: References: Message-Id: Date: Sat, 22 Nov 2014 00:46:39 +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_154550_656810_2F1DE0CA X-CRM114-Status: GOOD ( 11.37 ) 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). Acked-by: Andrew Lunn 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 7cefb9b6d27c..bdb36a05c039 100644 --- a/arch/arm/boot/dts/armada-xp.dtsi +++ b/arch/arm/boot/dts/armada-xp.dtsi @@ -43,6 +43,11 @@ wt-override; }; + spi0: spi@10600 { + pinctrl-0 = <&spi0_pins>; + pinctrl-names = "default"; + }; + i2c0: i2c@11000 { compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c"; reg = <0x11000 0x100>; @@ -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";