From patchwork Fri Sep 19 20:14:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Hesselbarth X-Patchwork-Id: 4940001 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 186789F350 for ; Fri, 19 Sep 2014 20:18:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1ED1020115 for ; Fri, 19 Sep 2014 20:18:21 +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 DBC1520211 for ; Fri, 19 Sep 2014 20:18:19 +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 1XV4bO-0008DE-PQ; Fri, 19 Sep 2014 20:16:22 +0000 Received: from mail-wg0-x231.google.com ([2a00:1450:400c:c00::231]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XV4aH-00063I-Ie for linux-arm-kernel@lists.infradead.org; Fri, 19 Sep 2014 20:15:16 +0000 Received: by mail-wg0-f49.google.com with SMTP id x13so233347wgg.20 for ; Fri, 19 Sep 2014 13:14:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1skrO19K3MZVmoVdb05Qjzoeahk12DUsmAPHJhTjlUI=; b=Zdbx8RXZ6Kf8oEw3LYdbKx0YJIp9Xr9mq1w7JCIHnBcUWbThz/gDOv24IrMX7Ja1w3 PC5vkHunSdtPXh2yhfJwiVX+r7EjuYKjzDdFbRcVteYCFoEtYEGK85EIo/l3MWBetOD7 qxoynihgo6Fob8bhzMl7UUZSCEYapHFsQ5ASTdCsfJ7wo9npl0hn1kxjA4RpQ+2BKyZX 7Y0nw09NQOrFpF/Yu5kVdAcSKua08cP2XAxo75JPocv6n1dxN+iKPklRlElhX4EKkwpO a2WcBlhoFm5VgwMc1TTm6hiieNwd1a80Ica3lJrFcFf9nnkR/TlEoBYkObKxCdWDls/J Rasw== X-Received: by 10.180.100.167 with SMTP id ez7mr598943wib.14.1411157691227; Fri, 19 Sep 2014 13:14:51 -0700 (PDT) Received: from topkick.lan (f051005106.adsl.alicedsl.de. [78.51.5.106]) by mx.google.com with ESMTPSA id hm7sm3177107wib.12.2014.09.19.13.14.49 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Sep 2014 13:14:49 -0700 (PDT) From: Sebastian Hesselbarth To: Sebastian Hesselbarth Subject: [PATCH 2/8] ARM: mvebu: armada-xp: Add node alias to pinctrl and add base address Date: Fri, 19 Sep 2014 22:14:38 +0200 Message-Id: <1411157684-6991-3-git-send-email-sebastian.hesselbarth@gmail.com> In-Reply-To: <1411157684-6991-1-git-send-email-sebastian.hesselbarth@gmail.com> References: <1411157684-6991-1-git-send-email-sebastian.hesselbarth@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140919_131513_839928_EEC39810 X-CRM114-Status: GOOD ( 10.37 ) X-Spam-Score: -0.8 (/) Cc: Thomas Petazzoni , Andrew Lunn , Jason Cooper , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Ezequiel Garcia , Gregory Clement , 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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In other MVEBU SoCs, the pin controller node is called pin-ctrl with its base address added. Also, we have a node alias to access the pinctrl node easily. Fix this for Armada XP pinctrl nodes to be consistent with other SoCs. Signed-off-by: Sebastian Hesselbarth Acked-by: Thomas Petazzoni --- Cc: Jason Cooper Cc: Andrew Lunn Cc: Gregory Clement Cc: Ezequiel Garcia Cc: Thomas Petazzoni Cc: devicetree@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- arch/arm/boot/dts/armada-xp-axpwifiap.dts | 2 +- arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 2 +- arch/arm/boot/dts/armada-xp-mv78230.dtsi | 2 +- arch/arm/boot/dts/armada-xp-mv78260.dtsi | 2 +- arch/arm/boot/dts/armada-xp-mv78460.dtsi | 2 +- arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 2 +- arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 2 +- arch/arm/boot/dts/armada-xp.dtsi | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/armada-xp-axpwifiap.dts b/arch/arm/boot/dts/armada-xp-axpwifiap.dts index a55a97a70505..546016148283 100644 --- a/arch/arm/boot/dts/armada-xp-axpwifiap.dts +++ b/arch/arm/boot/dts/armada-xp-axpwifiap.dts @@ -60,7 +60,7 @@ }; internal-regs { - pinctrl { + pinctrl: pin-ctrl@18000 { pinctrl-0 = <&pmx_phy_int>; pinctrl-names = "default"; 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 469cf7137595..baa43a004299 100644 --- a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts +++ b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts @@ -51,7 +51,7 @@ }; internal-regs { - pinctrl { + pinctrl: pin-ctrl@18000 { poweroff_pin: poweroff-pin { marvell,pins = "mpp24"; marvell,function = "gpio"; diff --git a/arch/arm/boot/dts/armada-xp-mv78230.dtsi b/arch/arm/boot/dts/armada-xp-mv78230.dtsi index b5933aa9ab50..e24ef072b8cb 100644 --- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi @@ -167,7 +167,7 @@ }; internal-regs { - pinctrl { + pinctrl: pin-ctrl@18000 { compatible = "marvell,mv78230-pinctrl"; }; diff --git a/arch/arm/boot/dts/armada-xp-mv78260.dtsi b/arch/arm/boot/dts/armada-xp-mv78260.dtsi index 5954b362180c..53dfb157b91a 100644 --- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi @@ -251,7 +251,7 @@ }; internal-regs { - pinctrl { + pinctrl: pin-ctrl@18000 { compatible = "marvell,mv78260-pinctrl"; }; diff --git a/arch/arm/boot/dts/armada-xp-mv78460.dtsi b/arch/arm/boot/dts/armada-xp-mv78460.dtsi index 735924d62e12..8b4ab0a5d620 100644 --- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi @@ -289,7 +289,7 @@ }; internal-regs { - pinctrl { + pinctrl: pin-ctrl@18000 { compatible = "marvell,mv78460-pinctrl"; }; diff --git a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts index 0cf999abc4ed..b3951c39c5da 100644 --- a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts +++ b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts @@ -55,7 +55,7 @@ }; internal-regs { - pinctrl { + pinctrl: pin-ctrl@18000 { poweroff: poweroff { marvell,pins = "mpp42"; marvell,function = "gpio"; diff --git a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts index 4e5a59ee1501..394f085751be 100644 --- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts +++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts @@ -77,7 +77,7 @@ serial@12100 { status = "okay"; }; - pinctrl { + pinctrl: pin-ctrl@18000 { led_pins: led-pins-0 { marvell,pins = "mpp49", "mpp51", "mpp53"; marvell,function = "gpio"; diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi index 75653774342a..b5fd8c69dfff 100644 --- a/arch/arm/boot/dts/armada-xp.dtsi +++ b/arch/arm/boot/dts/armada-xp.dtsi @@ -71,7 +71,7 @@ status = "disabled"; }; - pinctrl { + pinctrl: pin-ctrl@18000 { reg = <0x18000 0x38>; sdio_pins: sdio-pins {