ARM: dts: armada-385-linksys: group pins in pinctrl

A pin group per node is sufficient, further specialization 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 <ralph.sennhauser@gmail.com>
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

diff --git a/arch/arm/boot/dts/armada-385-linksys.dtsi b/arch/arm/boot/dts/armada-385-linksys.dtsi
index 485abffb43686bd47a6f015157ba8f8c90a05c58..1bb974a7c30ba7336579b433ade8dc473b3d58e2 100644 (file)
--- a/arch/arm/boot/dts/armada-385-linksys.dtsi
+++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
@@ -83,7 +83,7 @@ gpio_keys: gpio-keys {
                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 @@ button@2 {
 
        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 @@ &pcie2 {
 };
 
 &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";
        };