From patchwork Mon Nov 17 23:28:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Ebalard X-Patchwork-Id: 5324481 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 4A93B9F2ED for ; Mon, 17 Nov 2014 23:30:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7B30820127 for ; Mon, 17 Nov 2014 23:30:46 +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 AB6122012B for ; Mon, 17 Nov 2014 23:30:45 +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 1XqViT-0004Ud-8V; Mon, 17 Nov 2014 23:28:17 +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 1XqVhn-0003d8-Ms for linux-arm-kernel@lists.infradead.org; Mon, 17 Nov 2014 23:27:36 +0000 Received: by smtp.natisbad.org (Postfix, from userid 109) id D0E89170073C; Tue, 18 Nov 2014 00:27:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1416266832; bh=7kmSbVQa3mUrq5S0ka6coXy35w3JPHNCZnjS3KGTZS0=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=2qo6OCW1nCJQbYJ41Pjp2ncDEKObs7IYYoTNCZZudEPKPQHJg1EJtQTz8paSozKoK rHaQZ3uKT7z0z96mG1CPtTSkqizaDWM3KWakqnpfbEJDTgkDpXEi+B9xJsfyqeJt/O gUGSI3pwvHLVbACvT8iXAmOXXapqkTER1+Wl6xto= 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 8D1FA1700468; Tue, 18 Nov 2014 00:24:53 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1416266693; bh=7kmSbVQa3mUrq5S0ka6coXy35w3JPHNCZnjS3KGTZS0=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=TzBh06nQ0h80VfdE1OOunCkxCYWHRv4YcLYIVAdFvo0qBET4g/Jh89BKJth1ISCCF H/OxKQcsH9aCV3/FLUlVlfJz1h28soBtgBkQmFCDJ0sEjW1gvA68Ji5CrUuSqXNGDi eEMfEWzhyLp+TqwG4iOugh9HDPny5Tad1w02X+vs= X-Hashcash: 1:20:141117:jason@lakedaemon.net::Q0ViZ3cDVi9JOd7i:000000000000000000000000000000000000000000R1v X-Hashcash: 1:20:141117:andrew@lunn.ch::E/ZKskHW11vj4qDQ:0001VDQ X-Hashcash: 1:20:141117:gregory.clement@free-electrons.com::AihQ5UKhbLLQEzMC:0000000000000000000000000007SDK X-Hashcash: 1:20:141117:sebastian.hesselbarth@gmail.com::S7MPSxBT0tqU49sK:0000000000000000000000000000004ebt X-Hashcash: 1:20:141117:klightspeed@killerwolves.net::eKsStq8oxMQ8Wwhv:0000000000000000000000000000000006cK2 X-Hashcash: 1:20:141117:linux@arm.linux.org.uk::y3gTsw7rhCpOrMiv:000000000000000000000000000000000000000DA9G X-Hashcash: 1:20:141117:linux-arm-kernel@lists.infradead.org::ZTpU+xiINKwMqfNH:00000000000000000000000002Aoy X-Hashcash: 1:20:141117:rob.herring@calxeda.com::rT6or/8gnR2QyuxP:000000000000000000000000000000000000000n0N X-Hashcash: 1:20:141117:pawel.moll@arm.com::eBB9dUouPsjzhz+l:00000000000000000000000000000000000000000008nKK X-Hashcash: 1:20:141117:mark.rutland@arm.com::6Y5SOTRpQau0l3m/:000000000000000000000000000000000000000001UsS X-Hashcash: 1:20:141117:swarren@wwwdotorg.org::Xo8kgiBOIqreIJqq:00000000000000000000000000000000000000001SKT X-Hashcash: 1:20:141117:ijc+devicetree@hellion.org.uk::poBNn2jgF3WbLapO:000000000000000000000000000000006fuR X-Hashcash: 1:20:141117:devicetree@vger.kernel.org::xHRZSCf5X5unmCoV:000000000000000000000000000000000000AJp From: Arnaud Ebalard To: Jason Cooper , Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Ben Peddell Subject: [PATCHv3 10/12] arm: mvebu: define and use common Armada XP SPI pinctrl setting In-Reply-To: References: Message-Id: Date: Tue, 18 Nov 2014 00:28:14 +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-20141117_152736_107137_25E43329 X-CRM114-Status: GOOD ( 11.40 ) 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. 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 7a6e50632a1f..804496edac9a 100644 --- a/arch/arm/boot/dts/armada-xp-axpwifiap.dts +++ b/arch/arm/boot/dts/armada-xp-axpwifiap.dts @@ -69,11 +69,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"; @@ -120,8 +115,6 @@ spi0: spi@10600 { status = "okay"; - pinctrl-0 = <&pmx_spi>; - pinctrl-names = "default"; spi-flash@0 { #address-cells = <1>; diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi index 4f685f7ec273..51454de322b1 100644 --- a/arch/arm/boot/dts/armada-xp.dtsi +++ b/arch/arm/boot/dts/armada-xp.dtsi @@ -72,6 +72,17 @@ "mpp20", "mpp21", "mpp22", "mpp23"; marvell,function = "ge1"; }; + + spi0_pins: spi0-pins { + marvell,pins = "mpp36", "mpp37", + "mpp38", "mpp39"; + marvell,function = "spi"; + }; + }; + + spi0: spi@10600 { + pinctrl-0 = <&spi0_pins>; + pinctrl-names = "default"; }; i2c0: i2c@11000 {