[10/13] ARM: dts: armada-385-linksys: group pins in pinctrl

Commit Message

Ralph Sennhauser May 21, 2017, 12:48 p.m. UTC

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 <[e-mail]>
---
 arch/arm/boot/dts/armada-385-linksys.dtsi | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

Comments

Andrew Lunn May 23, 2017, 12:06 p.m. UTC | #1

On Sun, May 21, 2017 at 02:48:59PM +0200, Ralph Sennhauser wrote:
> 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 <[e-mail]>

Reviewed-by: Andrew Lunn <[e-mail]>

    Andrew

Patch

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";
 	};