From patchwork Sat Nov 22 16:23:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Ebalard X-Patchwork-Id: 5359601 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 B352C9F1E1 for ; Sat, 22 Nov 2014 16:23:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C754D2014A for ; Sat, 22 Nov 2014 16:23:12 +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 AE0F420148 for ; Sat, 22 Nov 2014 16:23:11 +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 1XsDR2-0001sZ-Cc; Sat, 22 Nov 2014 16:21:20 +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 1XsDQy-0001l5-9D for linux-arm-kernel@lists.infradead.org; Sat, 22 Nov 2014 16:21:17 +0000 Received: by smtp.natisbad.org (Postfix, from userid 109) id D6D521700533; Sat, 22 Nov 2014 17:20:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1416673231; bh=Kj/SFfD61QlgkqR6czwtaT1hNTrHtvBogRYimMiWuQ8=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=wwsYHECaQO1/TsAc7rpc6ZeqS3mzuzKwxpQyIsxjT2glfqTPgwbwAiqrUweAHvB1r JAvjE/dv4qwg2stTL+UW4+NiETxmsfv3wucshC5b0qRL9sqRqoEq+YdB8cUeG7o6Ob 1EKr3cxNNsKFsAKxlou9T0MCgJl38vDi3GV11CRE= 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 16FE81700420; Sat, 22 Nov 2014 17:20:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1416673206; bh=Kj/SFfD61QlgkqR6czwtaT1hNTrHtvBogRYimMiWuQ8=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=lYRe2XNiubNbX4SivLpcpftwOYAPVL2F3NaK2CgrqnLeDtwwRMHT/c68tKkASCNI1 KxJdmXm4DNl5e18SmO47sdE53wWQn8Wme7DVVZIC8XepuYGSP0srGQJd5ynw9QEib1 C7EdOi5J2SRozoGctOwvp0JONTf0rDTsWx8bGSUY= X-Hashcash: 1:20:141122:jason@lakedaemon.net::o6DF8TzoReHF47jh:00000000000000000000000000000000000000000E54j X-Hashcash: 1:20:141122:andrew@lunn.ch::2a1wD8Jpz3LWPhEK:0005lpm X-Hashcash: 1:20:141122:gregory.clement@free-electrons.com::pQZeQnfwcmVPYtGL:0000000000000000000000000000HSw X-Hashcash: 1:20:141122:sebastian.hesselbarth@gmail.com::6ftnVoxQNjH13msg:000000000000000000000000000000Bk5r X-Hashcash: 1:20:141122:klightspeed@killerwolves.net::2C8WBcKJDmpH9kpy:0000000000000000000000000000000003z8r X-Hashcash: 1:20:141122:linux@arm.linux.org.uk::h8dQCHYtcxSDiD/n:0000000000000000000000000000000000000001jrd X-Hashcash: 1:20:141122:linux-arm-kernel@lists.infradead.org::/mnJ44WFeIH/Sdrb:00000000000000000000000005YQG X-Hashcash: 1:20:141122:rob.herring@calxeda.com::+0oYb3qyiendZ1s4:000000000000000000000000000000000000002ipA X-Hashcash: 1:20:141122:pawel.moll@arm.com::PeMeU2OXgMCGaB/H:000000000000000000000000000000000000000000023uZ X-Hashcash: 1:20:141122:mark.rutland@arm.com::VcvEqeVsaV0pWa8Y:000000000000000000000000000000000000000002Mly X-Hashcash: 1:20:141122:swarren@wwwdotorg.org::TBGMOTiBP25tqfRl:00000000000000000000000000000000000000003Akw X-Hashcash: 1:20:141122:ijc+devicetree@hellion.org.uk::veWbHZxVDcdgcq6C:00000000000000000000000000000000BSje X-Hashcash: 1:20:141122:devicetree@vger.kernel.org::sq82xudyi5WHVb8z:000000000000000000000000000000000008Wsq From: Arnaud Ebalard To: Jason Cooper , Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Ben Peddell Subject: [PATCHv0 2/2] arm: mvebu: normalize pinctrl entries for Armada SoCs In-Reply-To: References: Message-Id: <00114c3169e1d93259ff4150ed46ee36eae16b1e.1416670812.git.arno@natisbad.org> Date: Sat, 22 Nov 2014 17:23:30 +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-20141122_082116_670883_3FE8AD1B X-CRM114-Status: GOOD ( 10.04 ) 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 There are currently 2 differents naming conventions used between the existing Armada SoC DT files for pinctrl entries (*_pin(s): *-pin(s) and pmx_*: pmx-*) with a vast majority of files using the former: $ grep _pin arch/arm/boot/dts/armada-*.dts* | wc -l 155 $ grep pmx arch/arm/boot/dts/armada-*.dts* | wc -l 13 In fact, only some Armada XP files are using the second variant. This patch normalizes those files (mainly ge0/1 entries) to use the first variant. Signed-off-by: Arnaud Ebalard --- arch/arm/boot/dts/armada-xp-axpwifiap.dts | 12 ++++++------ arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 4 ++-- arch/arm/boot/dts/armada-xp-synology-ds414.dts | 4 ++-- arch/arm/boot/dts/armada-xp.dtsi | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/arch/arm/boot/dts/armada-xp-axpwifiap.dts b/arch/arm/boot/dts/armada-xp-axpwifiap.dts index c9d25bdbe795..ba7ef9a2a904 100644 --- a/arch/arm/boot/dts/armada-xp-axpwifiap.dts +++ b/arch/arm/boot/dts/armada-xp-axpwifiap.dts @@ -84,14 +84,14 @@ }; ethernet@70000 { - pinctrl-0 = <&pmx_ge0_rgmii>; + pinctrl-0 = <&ge0_rgmii_pins>; pinctrl-names = "default"; status = "okay"; phy = <&phy0>; phy-mode = "rgmii-id"; }; ethernet@74000 { - pinctrl-0 = <&pmx_ge1_rgmii>; + pinctrl-0 = <&ge1_rgmii_pins>; pinctrl-names = "default"; status = "okay"; phy = <&phy1>; @@ -116,7 +116,7 @@ compatible = "gpio-keys"; #address-cells = <1>; #size-cells = <0>; - pinctrl-0 = <&pmx_keys>; + pinctrl-0 = <&keys_pin>; pinctrl-names = "default"; button@1 { @@ -128,15 +128,15 @@ }; &pinctrl { - pinctrl-0 = <&pmx_phy_int>; + pinctrl-0 = <&phy_int_pin>; pinctrl-names = "default"; - pmx_keys: pmx-keys { + keys_pin: keys-pin { marvell,pins = "mpp33"; marvell,function = "gpio"; }; - pmx_phy_int: pmx-phy-int { + phy_int_pin: phy-int-pin { marvell,pins = "mpp32"; marvell,function = "gpio"; }; diff --git a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts index 088d8d2fe9eb..a2ef93c1eb10 100644 --- a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts +++ b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts @@ -66,7 +66,7 @@ }; ethernet@70000 { - pinctrl-0 = <&pmx_ge0_rgmii>; + pinctrl-0 = <&ge0_rgmii_pins>; pinctrl-names = "default"; status = "okay"; phy = <&phy0>; @@ -74,7 +74,7 @@ }; ethernet@74000 { - pinctrl-0 = <&pmx_ge1_rgmii>; + pinctrl-0 = <&ge1_rgmii_pins>; pinctrl-names = "default"; status = "okay"; phy = <&phy1>; diff --git a/arch/arm/boot/dts/armada-xp-synology-ds414.dts b/arch/arm/boot/dts/armada-xp-synology-ds414.dts index 97cbf980c54d..749fdba5a642 100644 --- a/arch/arm/boot/dts/armada-xp-synology-ds414.dts +++ b/arch/arm/boot/dts/armada-xp-synology-ds414.dts @@ -184,14 +184,14 @@ ethernet@70000 { status = "okay"; - pinctrl-0 = <&pmx_ge0_rgmii>; + pinctrl-0 = <&ge0_rgmii_pins>; pinctrl-names = "default"; phy = <&phy1>; phy-mode = "rgmii-id"; }; ethernet@74000 { - pinctrl-0 = <&pmx_ge1_rgmii>; + pinctrl-0 = <&ge1_rgmii_pins>; pinctrl-names = "default"; status = "okay"; phy = <&phy0>; diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi index bdb36a05c039..a2a6451524dc 100644 --- a/arch/arm/boot/dts/armada-xp.dtsi +++ b/arch/arm/boot/dts/armada-xp.dtsi @@ -212,7 +212,7 @@ }; &pinctrl { - pmx_ge0_gmii: pmx-ge0-gmii { + ge0_gmii_pins: ge0-gmii-pins { marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3", "mpp4", "mpp5", "mpp6", "mpp7", @@ -223,7 +223,7 @@ marvell,function = "ge0"; }; - pmx_ge0_rgmii: pmx-ge0-rgmii { + ge0_rgmii_pins: ge0-rgmii-pins { marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3", "mpp4", "mpp5", "mpp6", "mpp7", @@ -231,7 +231,7 @@ marvell,function = "ge0"; }; - pmx_ge1_rgmii: pmx-ge1-rgmii { + ge1_rgmii_pins: ge1-rgmii-pins { marvell,pins = "mpp12", "mpp13", "mpp14", "mpp15", "mpp16", "mpp17", "mpp18", "mpp19",