ARM: dts: armada: align LED node names with dtschema

The node names should be generic and DT schema expects certain pattern:

  armada-370-seagate-personal-cloud.dtb: gpio-leds: 'red-sata0' does not match any of the regexes: '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>

diff --git a/arch/arm/boot/dts/armada-370-dlink-dns327l.dts b/arch/arm/boot/dts/armada-370-dlink-dns327l.dts
index 2008c6eaaa528968346f97d2edca7c8170428778..561195b749ebe0ed806d4e087aefe658a7d1ad0e 100644 (file)
--- a/arch/arm/boot/dts/armada-370-dlink-dns327l.dts
+++ b/arch/arm/boot/dts/armada-370-dlink-dns327l.dts
@@ -86,19 +86,19 @@
 
                pinctrl-names = "default";
 
-               sata-r-amber-pin {
+               led-sata-r-amber {
                        label = "dns327l:amber:sata-r";
                        gpios = <&gpio1 20 GPIO_ACTIVE_HIGH>;
                        default-state = "keep";
                };
 
-               sata-l-amber-pin {
+               led-sata-l-amber {
                        label = "dns327l:amber:sata-l";
                        gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
                        default-state = "keep";
                };
 
-               backup-led-pin {
+               led-backup {
                        label = "dns327l:white:usb";
                        gpios = <&gpio1 29 GPIO_ACTIVE_HIGH>;
                        default-state = "keep";

diff --git a/arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts b/arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts
index 3cf70c72c5ca3ccffd1976abc67ac44f285ccabf..9cb69999b1dbcf83d5847a7251e6863227a032a2 100644 (file)
--- a/arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts
+++ b/arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts
@@ -72,11 +72,11 @@
        };
 
        gpio-leds {
-               red-sata2 {
+               led-red-sata2 {
                        label = "dart:red:sata2";
                        gpios = <&pca9554 0 GPIO_ACTIVE_LOW>;
                };
-               red-sata3 {
+               led-red-sata3 {
                        label = "dart:red:sata3";
                        gpios = <&pca9554 3 GPIO_ACTIVE_LOW>;
                };

diff --git a/arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi b/arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi
index 866b8630d407ef0b7049e0a7fd4f5b20f866ebe3..822f10734946d7863d96818acd687fdc1921939b 100644 (file)
--- a/arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi
+++ b/arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi
@@ -132,21 +132,21 @@
        gpio-leds {
                compatible = "gpio-leds";
 
-               white-power {
+               led-white-power {
                        label = "dart:white:power";
                        gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "timer";
 
                };
-               red-power {
+               led-red-power {
                        label = "dart:red:power";
                        gpios = <&gpio1 31 GPIO_ACTIVE_HIGH>;
                };
-               red-sata0 {
+               led-red-sata0 {
                        label = "dart:red:sata0";
                        gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
                };
-               red-sata1 {
+               led-red-sata1 {
                        label = "dart:red:sata1";
                        gpios = <&gpio1 21 GPIO_ACTIVE_LOW>;
                };

diff --git a/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi b/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi
index 702a85af2078363c06c5a65a543978686652536e..124a8ba279e37cf0ffce9b99b81866ab063a81c9 100644 (file)
--- a/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi
+++ b/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi
@@ -107,7 +107,7 @@
        gpio-leds {
                compatible = "gpio-leds";
 
-               red-sata0 {
+               led-red-sata0 {
                        label = "cumulus:red:sata0";
                        gpios = <&gpio1 26 GPIO_ACTIVE_HIGH>;
                        default-state = "off";

diff --git a/arch/arm/boot/dts/armada-385-linksys-caiman.dts b/arch/arm/boot/dts/armada-385-linksys-caiman.dts
index a03050c97084c5c809a2834d70452deb8767b58b..88b2921fed55bdc75b57865ee886d6678de80c63 100644 (file)
--- a/arch/arm/boot/dts/armada-385-linksys-caiman.dts
+++ b/arch/arm/boot/dts/armada-385-linksys-caiman.dts
@@ -62,11 +62,11 @@
 };
 
 &gpio_leds {
-       power {
+       led-power {
                label = "caiman:white:power";
        };
 
-       sata {
+       led-sata {
                label = "caiman:white:sata";
        };
 };

diff --git a/arch/arm/boot/dts/armada-385-linksys-cobra.dts b/arch/arm/boot/dts/armada-385-linksys-cobra.dts
index e3e4877a6f4957ccc9802edac5b86faa5fcfae95..88200f930d0d824b0a6017d36f596025c8681597 100644 (file)
--- a/arch/arm/boot/dts/armada-385-linksys-cobra.dts
+++ b/arch/arm/boot/dts/armada-385-linksys-cobra.dts
@@ -62,11 +62,11 @@
 };
 
 &gpio_leds {
-       power {
+       led-power {
                label = "cobra:white:power";
        };
 
-       sata {
+       led-sata {
                label = "cobra:white:sata";
        };
 };

diff --git a/arch/arm/boot/dts/armada-385-linksys-rango.dts b/arch/arm/boot/dts/armada-385-linksys-rango.dts
index 3c4af57ec2b9e03a407f416a1208a657b0da3dfc..4ab45f294de2280f468249eac267cd9f27ba9190 100644 (file)
--- a/arch/arm/boot/dts/armada-385-linksys-rango.dts
+++ b/arch/arm/boot/dts/armada-385-linksys-rango.dts
@@ -54,22 +54,22 @@
 };
 
 &gpio_leds {
-       power {
+       led-power {
                gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>;
                label = "rango:white:power";
        };
 
-       sata {
+       led-sata {
                gpios = <&gpio0 21 GPIO_ACTIVE_LOW>;
                label = "rango:white:sata";
        };
 
-       wlan_2g {
+       led-wlan_2g {
                gpios = <&gpio1 13 GPIO_ACTIVE_LOW>;
                label = "rango:white:wlan_2g";
        };
 
-       wlan_5g {
+       led-wlan_5g {
                gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
                label = "rango:white:wlan_5g";
        };

diff --git a/arch/arm/boot/dts/armada-385-linksys-shelby.dts b/arch/arm/boot/dts/armada-385-linksys-shelby.dts
index 3451cd3e5dff9d47cf8a83190447d81ee81b2818..f1b1f22413f1b77f03bfe3e09d6298abe6870e7a 100644 (file)
--- a/arch/arm/boot/dts/armada-385-linksys-shelby.dts
+++ b/arch/arm/boot/dts/armada-385-linksys-shelby.dts
@@ -62,11 +62,11 @@
 };
 
 &gpio_leds {
-       power {
+       led-power {
                label = "shelby:white:power";
        };
 
-       sata {
+       led-sata {
                label = "shelby:white:sata";
        };
 };

diff --git a/arch/arm/boot/dts/armada-385-linksys.dtsi b/arch/arm/boot/dts/armada-385-linksys.dtsi
index 116aca5e688fc60d6234bc956f0a6fb4528f9052..85e8d966f6c1fc8389b41a1d61b5f421e1d17317 100644 (file)
--- a/arch/arm/boot/dts/armada-385-linksys.dtsi
+++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
@@ -71,12 +71,12 @@
                pinctrl-0 = <&gpio_leds_pins>;
                pinctrl-names = "default";
 
-               power {
+               led-power {
                        gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>;
                        default-state = "on";
                };
 
-               sata {
+               led-sata {
                        gpios = <&gpio1 22 GPIO_ACTIVE_LOW>;
                        default-state = "off";
                        linux,default-trigger = "disk-activity";

diff --git a/arch/arm/boot/dts/armada-385-synology-ds116.dts b/arch/arm/boot/dts/armada-385-synology-ds116.dts
index 2622af73c9da6a6c214b0ace7bdb09908d5ba980..ea91ff964d94ec3dbdfc4088b7ca96dcbbf60010 100644 (file)
--- a/arch/arm/boot/dts/armada-385-synology-ds116.dts
+++ b/arch/arm/boot/dts/armada-385-synology-ds116.dts
@@ -149,7 +149,7 @@
                         * sata0, and accesses to SATA disk 0 make it blink so it
                         * doesn't need to be declared here.
                         */
-                       orange {
+                       led-orange {
                                gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
                                label = "ds116:orange:disk";
                                default-state = "off";

diff --git a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
index 622ac40dd16443ac5062cf146e97432446253a9d..dbe8dfe236fbeedd88e639e6d88ef0212e35960d 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
+++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
@@ -195,7 +195,7 @@
                pinctrl-0 = <&power_led_pin>;
                pinctrl-names = "default";
 
-               power {
+               led-power {
                        label = "mamba:white:power";
                        gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
                        default-state = "on";