From patchwork Sun May 21 12:48:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ralph Sennhauser X-Patchwork-Id: 9739033 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E241F60328 for ; Sun, 21 May 2017 12:51:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D1BF128643 for ; Sun, 21 May 2017 12:51:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C5987286DC; Sun, 21 May 2017 12:51:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 44BBB28643 for ; Sun, 21 May 2017 12:51:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=jJ32/3D2BGQ1NHwBnrm1B1J2le/RFwqGaUCDl0IgWR8=; b=tERla4wQ7E847rOvt6ymj+xmez 6FobOGPhUDmj06GjyWrFfBKZxfU5C/CucJVlCBgWnEKt3+gLMfJ9zVaAS5hlyKP8YWbK5dTcL+FkQ Qmh+BqU+vft7CIERVO5OaMPlbelk5mui3UnUHZ3AZIha4n9MxYwt0tmrYC84mP2tDbiNVrmY2hTH7 kfcgsoA2PR0VBBhpMsa/3QqFPd99d6zNXpmPmT9vbJiwW1eyTKnoGADPxbaeJH7qs7qONSDqvMJN3 1fJU9vpWUmLapkNBqWE/qQ3o1wqKG9FynifvpDMxWG7FNIDkFn9LLfIpW5S78j5c8FqvPUn07nsUy DWnHWbMg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dCQKp-0007zv-RR; Sun, 21 May 2017 12:51:47 +0000 Received: from mail-ua0-x244.google.com ([2607:f8b0:400c:c08::244]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dCQJE-00050M-WB for linux-arm-kernel@lists.infradead.org; Sun, 21 May 2017 12:50:13 +0000 Received: by mail-ua0-x244.google.com with SMTP id e28so6003520uah.2 for ; Sun, 21 May 2017 05:49:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0iWXEVEvSPF+CRkxDe5EILl+sc+VjL9YFD4WgeYqpXI=; b=ApsioTEx/RWLsMUqQQ+7FDO63em27tz3SLV9IzTxKgH67axrjhaZvJ7YO8D0qYUhyW IXE3HDPcOQ8OVlZ57I2p+73FVEq1hIIejRzw4hHhrvjUR2ZY+iLYA827hOsm8sl58lVC v+jiz/n2sIVgwwooSneJdacPPAaTJnLcr+zG4qrPcDzKAFqPF+nUGRkVfx42/tmGNomZ 1G68HUaQEwW4M3rAUaDVvkLAw+p9xK5Dc/im9+364RvmOc8FHNioi5U5+5JE7cp4jlvi M6jujl05WOP23zCFX/ztpCRJJXUmTHFctDT8NVb9pDUhLXoVFaIHRy8ultkAMu+HxZKq QMLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0iWXEVEvSPF+CRkxDe5EILl+sc+VjL9YFD4WgeYqpXI=; b=DlvTW8C5WKHhzvtU6ITh/NELpKk+88gG52ldZIn+oQs17y962GwRhimqHvR6DRvV6j WHdPCvib4rQknMxzULUr42S9aXBvM1bjFCKA3/92jEj2KIWnM1GQ6Y70hvCnglaJg6xo iTJMjYpC7UDdgUxD8QnvouLFzlnbpB/Nl9Z/8u/2LYhyTh7yZ5OE/FtjLt05ffJnolnG PBAraPw54Q+pse2WAH+4jpy79AZashSMvgx2WFIJfQdpPP3MzxBGX0Bw7M819LHzWwS3 Q3fLXmnxKUU4/MhQzIn9CVCipj9Qv+pedL61bap2STFYcK7CkqyOCqfcthwOUEKfAlh2 PPPg== X-Gm-Message-State: AODbwcCkCvz/T6N+woQKLA4dYFEOD4kWzR5unqCVCurmEo3pd2XYEM36 gnBSP+n8lWwvqg== X-Received: by 10.176.8.65 with SMTP id b1mr9530084uaf.82.1495370988154; Sun, 21 May 2017 05:49:48 -0700 (PDT) Received: from localhost.lan ([37.209.189.139]) by smtp.googlemail.com with ESMTPSA id q17sm2803410uab.7.2017.05.21.05.49.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 21 May 2017 05:49:46 -0700 (PDT) From: Ralph Sennhauser To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 10/13] ARM: dts: armada-385-linksys: group pins in pinctrl Date: Sun, 21 May 2017 14:48:59 +0200 Message-Id: <20170521124903.11050-11-ralph.sennhauser@gmail.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170521124903.11050-1-ralph.sennhauser@gmail.com> References: <20170521124903.11050-1-ralph.sennhauser@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170521_055009_501969_0C0C149C X-CRM114-Status: GOOD ( 11.24 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Andrew Lunn , Jason Cooper , devicetree@vger.kernel.org, Russell King , linux-kernel@vger.kernel.org, Ralph Sennhauser , Rob Herring , Gregory Clement , Imre Kaloz , Sebastian Hesselbarth MIME-Version: 1.0 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 A pin group per node is sufficient, further specialisation only serves as documentation which can be a comment just as well. This simplifies configuring pins for nodes in dependants. Also use labels which end up right by the node they are intended for. Signed-off-by: Ralph Sennhauser Reviewed-by: Andrew Lunn --- arch/arm/boot/dts/armada-385-linksys.dtsi | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/arch/arm/boot/dts/armada-385-linksys.dtsi b/arch/arm/boot/dts/armada-385-linksys.dtsi index 485abff..1bb974a 100644 --- a/arch/arm/boot/dts/armada-385-linksys.dtsi +++ b/arch/arm/boot/dts/armada-385-linksys.dtsi @@ -83,7 +83,7 @@ compatible = "gpio-keys"; #address-cells = <1>; #size-cells = <0>; - pinctrl-0 = <&keys_pin>; + pinctrl-0 = <&gpio_keys_pins>; pinctrl-names = "default"; button@1 { @@ -101,7 +101,7 @@ gpio_leds: gpio-leds { compatible = "gpio-leds"; - pinctrl-0 = <&power_led_pin &sata_led_pin>; + pinctrl-0 = <&gpio_leds_pins>; pinctrl-names = "default"; power { @@ -247,18 +247,15 @@ }; &pinctrl { - keys_pin: keys-pin { + gpio_keys_pins: gpio-keys-pins { + /* mpp24: wps, mpp29: reset */ marvell,pins = "mpp24", "mpp29"; marvell,function = "gpio"; }; - power_led_pin: power-led-pin { - marvell,pins = "mpp55"; - marvell,function = "gpio"; - }; - - sata_led_pin: sata-led-pin { - marvell,pins = "mpp54"; + gpio_leds_pins: gpio-leds-pins { + /* mpp54: sata, mpp55: power */ + marvell,pins = "mpp54", "mpp55"; marvell,function = "gpio"; };