From patchwork Mon Nov 17 23:27:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Ebalard X-Patchwork-Id: 5324441 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 EC3669F2ED for ; Mon, 17 Nov 2014 23:28:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 10F7020127 for ; Mon, 17 Nov 2014 23:28:45 +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 1D96920120 for ; Mon, 17 Nov 2014 23:28:44 +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 1XqVgb-0002qC-7n; Mon, 17 Nov 2014 23:26:21 +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 1XqVg7-0002Lu-Af for linux-arm-kernel@lists.infradead.org; Mon, 17 Nov 2014 23:25:52 +0000 Received: by smtp.natisbad.org (Postfix, from userid 109) id 38B041700D44; Tue, 18 Nov 2014 00:25:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1416266730; bh=T+Jn7yRtonauNOcEj5+v9DyWXnCG+INqrGBJXCLzY50=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=l/K2TQM+TZyysQxlBTXnWjAgvbqyIBZ2VgG3J8Fp2uy4XKH2epy5ZgjlaYKQN3KB9 0dZI9bEXIbWG6QWdGVYBWD0krIWijzjqDWiqUQ57Twoytk+aAqfAgx6rbqKcIALcQ/ yQppTkTOWp42lbjAs0jkZJnXe8gSPoF6883PtOyc= 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 897251700516; Tue, 18 Nov 2014 00:24:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1416266653; bh=T+Jn7yRtonauNOcEj5+v9DyWXnCG+INqrGBJXCLzY50=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=xgAUVi3SouvF1Vgf6ykCGSieNz/E47nOCqYFdwl1xywaToMTwue4U8egnK37yGZ4H 42pYtQ/1/8FykevQETzFJmhgsbIbvVOmFTQB3dUV8A2og84f4I8IH6PKtVh+9OHM8r jS0QLxZgFaxDnF8qbpjwJwQZ4+LEz/aQ1pCRFbeQ= X-Hashcash: 1:20:141117:jason@lakedaemon.net::MEKzTZww1k21BEqD:00000000000000000000000000000000000000000AZex X-Hashcash: 1:20:141117:andrew@lunn.ch::CkMCVgYB/t5Qqyjm:0001GtE X-Hashcash: 1:20:141117:gregory.clement@free-electrons.com::re8Wy3hpAZTDGkVU:0000000000000000000000000003X6N X-Hashcash: 1:20:141117:sebastian.hesselbarth@gmail.com::QMx799oKZQHoSt35:0000000000000000000000000000001WdQ X-Hashcash: 1:20:141117:klightspeed@killerwolves.net::f1w/nVrkPIUiWvuA:00000000000000000000000000000000064ir X-Hashcash: 1:20:141117:linux@arm.linux.org.uk::zOloHF8qUe+MC0KT:000000000000000000000000000000000000000CWyK X-Hashcash: 1:20:141117:linux-arm-kernel@lists.infradead.org::WMFfqEQCc9OFwF5n:00000000000000000000000000XAt X-Hashcash: 1:20:141117:rob.herring@calxeda.com::8XnKozsGK2lqrLV4:000000000000000000000000000000000000008pyJ X-Hashcash: 1:20:141117:pawel.moll@arm.com::8OiGm56deQvUm8S6:00000000000000000000000000000000000000000000EnJ X-Hashcash: 1:20:141117:mark.rutland@arm.com::G4s3g3EZ8/METgRg:000000000000000000000000000000000000000001ieO X-Hashcash: 1:20:141117:swarren@wwwdotorg.org::MyExkxKP17L5Wd0c:00000000000000000000000000000000000000001rYq X-Hashcash: 1:20:141117:ijc+devicetree@hellion.org.uk::bsajpob2n4g/6/El:000000000000000000000000000000003iKB X-Hashcash: 1:20:141117:devicetree@vger.kernel.org::EL2UBwqdKqqeIqYc:000000000000000000000000000000000001ZRH From: Arnaud Ebalard To: Jason Cooper , Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Ben Peddell Subject: [PATCHv3 05/12] arm: mvebu: remove duplications in pinctrl nodes for Armada 370/XP In-Reply-To: References: Message-Id: Date: Tue, 18 Nov 2014 00:27:34 +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_152551_566310_1815051D X-CRM114-Status: GOOD ( 10.85 ) 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 As suggested by Sebastian and Andrew, it is possible to refactor and remove duplications in pinctrl nodes for Armada 370/XP in the following way: 1) define a pinctrl node in armada-370-xp.dtsi w/ only the reg property defined (same for all 370/XP SoCs) 2) remove now redundant reg properties in armada-370.dtsi and armada-xp-mv*.dtsi files 3) move identical and redundant SDIO pins definitions found in armada-xp-mv*.dtsi to a newly created pinctrl node in armada-xp.dtsi Suggested-by: Sebastian Hesselbarth Suggested-by: Andrew Lunn Signed-off-by: Arnaud Ebalard --- arch/arm/boot/dts/armada-370-xp.dtsi | 4 ++++ arch/arm/boot/dts/armada-370.dtsi | 1 - arch/arm/boot/dts/armada-xp-mv78230.dtsi | 7 ------- arch/arm/boot/dts/armada-xp-mv78260.dtsi | 7 ------- arch/arm/boot/dts/armada-xp-mv78460.dtsi | 7 ------- arch/arm/boot/dts/armada-xp.dtsi | 8 ++++++++ 6 files changed, 12 insertions(+), 22 deletions(-) diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi index 2be9723bcdf3..02df61a6a11b 100644 --- a/arch/arm/boot/dts/armada-370-xp.dtsi +++ b/arch/arm/boot/dts/armada-370-xp.dtsi @@ -103,6 +103,10 @@ #size-cells = <1>; ranges = <0 MBUS_ID(0xf0, 0x01) 0 0x100000>; + pinctrl { + reg = <0x18000 0x38>; + }; + rtc@10300 { compatible = "marvell,orion-rtc"; reg = <0x10300 0x20>; diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi index 6b3c23b1e138..2040da11462b 100644 --- a/arch/arm/boot/dts/armada-370.dtsi +++ b/arch/arm/boot/dts/armada-370.dtsi @@ -113,7 +113,6 @@ pinctrl { compatible = "marvell,mv88f6710-pinctrl"; - reg = <0x18000 0x38>; sdio_pins1: sdio-pins1 { marvell,pins = "mpp9", "mpp11", "mpp12", diff --git a/arch/arm/boot/dts/armada-xp-mv78230.dtsi b/arch/arm/boot/dts/armada-xp-mv78230.dtsi index 2592e1c13560..b5933aa9ab50 100644 --- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi @@ -169,13 +169,6 @@ internal-regs { pinctrl { compatible = "marvell,mv78230-pinctrl"; - reg = <0x18000 0x38>; - - sdio_pins: sdio-pins { - marvell,pins = "mpp30", "mpp31", "mpp32", - "mpp33", "mpp34", "mpp35"; - marvell,function = "sd0"; - }; }; gpio0: gpio@18100 { diff --git a/arch/arm/boot/dts/armada-xp-mv78260.dtsi b/arch/arm/boot/dts/armada-xp-mv78260.dtsi index 480e237a870f..5954b362180c 100644 --- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi @@ -253,13 +253,6 @@ internal-regs { pinctrl { compatible = "marvell,mv78260-pinctrl"; - reg = <0x18000 0x38>; - - sdio_pins: sdio-pins { - marvell,pins = "mpp30", "mpp31", "mpp32", - "mpp33", "mpp34", "mpp35"; - marvell,function = "sd0"; - }; }; gpio0: gpio@18100 { diff --git a/arch/arm/boot/dts/armada-xp-mv78460.dtsi b/arch/arm/boot/dts/armada-xp-mv78460.dtsi index 2c7b1fef4703..735924d62e12 100644 --- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi @@ -291,13 +291,6 @@ internal-regs { pinctrl { compatible = "marvell,mv78460-pinctrl"; - reg = <0x18000 0x38>; - - sdio_pins: sdio-pins { - marvell,pins = "mpp30", "mpp31", "mpp32", - "mpp33", "mpp34", "mpp35"; - marvell,function = "sd0"; - }; }; gpio0: gpio@18100 { diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi index a68f5b837536..83bf32344a60 100644 --- a/arch/arm/boot/dts/armada-xp.dtsi +++ b/arch/arm/boot/dts/armada-xp.dtsi @@ -42,6 +42,14 @@ wt-override; }; + pinctrl { + sdio_pins: sdio-pins { + marvell,pins = "mpp30", "mpp31", "mpp32", + "mpp33", "mpp34", "mpp35"; + marvell,function = "sd0"; + }; + }; + i2c0: i2c@11000 { compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c"; reg = <0x11000 0x100>;