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

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

  imx50-kobo-aura.dtb: gpio-leds: 'on' does not match any of the regexes: '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
  imx6dl-yapp4-draco.dtb: led-controller@30: 'chan@0', 'chan@1', 'chan@2' do not match any of the regexes: '^led@[0-8]$', '^multi-led@[0-8]$', 'pinctrl-[0-9]+'

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/imx50-kobo-aura.dts b/arch/arm/boot/dts/imx50-kobo-aura.dts
index 51bf6117fb124078e3a0494c1f1a14f73aaafdef..467db6b4ed7f83cc97c0bb88a8e16d4408fe6322 100644 (file)
--- a/arch/arm/boot/dts/imx50-kobo-aura.dts
+++ b/arch/arm/boot/dts/imx50-kobo-aura.dts
@@ -26,7 +26,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_leds>;
 
-               on {
+               led-on {
                        label = "kobo_aura:orange:on";
                        gpios = <&gpio6 24 GPIO_ACTIVE_LOW>;
                        panic-indicator;

diff --git a/arch/arm/boot/dts/imx53-cx9020.dts b/arch/arm/boot/dts/imx53-cx9020.dts
index cfb18849a92b4e249b1123cec4e295e5260d3185..055d23a9aee7c0f280c8bbac823294dcd54fcef8 100644 (file)
--- a/arch/arm/boot/dts/imx53-cx9020.dts
+++ b/arch/arm/boot/dts/imx53-cx9020.dts
@@ -86,27 +86,27 @@
        leds {
                compatible = "gpio-leds";
 
-               pwr-r {
+               led-pwr-r {
                        gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
 
-               pwr-g {
+               led-pwr-g {
                        gpios = <&gpio3 24 GPIO_ACTIVE_HIGH>;
                        default-state = "on";
                };
 
-               pwr-b {
+               led-pwr-b {
                        gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
 
-               sd1-b {
+               led-sd1-b {
                        linux,default-trigger = "mmc0";
                        gpios = <&gpio3 20 GPIO_ACTIVE_HIGH>;
                };
 
-               sd2-b {
+               led-sd2-b {
                        linux,default-trigger = "mmc1";
                        gpios = <&gpio3 17 GPIO_ACTIVE_HIGH>;
                };

diff --git a/arch/arm/boot/dts/imx53-m53evk.dts b/arch/arm/boot/dts/imx53-m53evk.dts
index a1a6228d1aa66276923a83291d25c80389b733f6..2bd2432d317ff3459bb5bc0cc19a07e00c591d90 100644 (file)
--- a/arch/arm/boot/dts/imx53-m53evk.dts
+++ b/arch/arm/boot/dts/imx53-m53evk.dts
@@ -52,13 +52,13 @@
                pinctrl-names = "default";
                pinctrl-0 = <&led_pin_gpio>;
 
-               user1 {
+               led-user1 {
                        label = "user1";
                        gpios = <&gpio2 8 0>;
                        linux,default-trigger = "heartbeat";
                };
 
-               user2 {
+               led-user2 {
                        label = "user2";
                        gpios = <&gpio2 9 0>;
                        linux,default-trigger = "heartbeat";

diff --git a/arch/arm/boot/dts/imx53-m53menlo.dts b/arch/arm/boot/dts/imx53-m53menlo.dts
index d5c68d1ea707c6610ff1ef2b1c3bb9883ad5e803..4d77b6077fc1bb6d2686de68e33a02463c33f841 100644 (file)
--- a/arch/arm/boot/dts/imx53-m53menlo.dts
+++ b/arch/arm/boot/dts/imx53-m53menlo.dts
@@ -34,19 +34,19 @@
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_led>;
 
-               user1 {
+               led-user1 {
                        label = "TestLed601";
                        gpios = <&gpio6 1 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "mmc0";
                };
 
-               user2 {
+               led-user2 {
                        label = "TestLed602";
                        gpios = <&gpio6 2 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "heartbeat";
                };
 
-               eth {
+               led-eth {
                        label = "EthLedYe";
                        gpios = <&gpio2 11 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "netdev";

diff --git a/arch/arm/boot/dts/imx53-tx53.dtsi b/arch/arm/boot/dts/imx53-tx53.dtsi
index 892dd1a4bac352f4f55517cf62a758c6e543e9ca..a439a47fb65ac66d02fa3bf02ab75cd93764154b 100644 (file)
--- a/arch/arm/boot/dts/imx53-tx53.dtsi
+++ b/arch/arm/boot/dts/imx53-tx53.dtsi
@@ -94,7 +94,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_stk5led>;
 
-               user {
+               led-user {
                        label = "Heartbeat";
                        gpios = <&gpio2 20 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "heartbeat";

diff --git a/arch/arm/boot/dts/imx53-usbarmory.dts b/arch/arm/boot/dts/imx53-usbarmory.dts
index f34993a490ee86cbdbe7a9b8d2b4547b2057d036..acc44010d510695b28dc8e6599ba006856a89efb 100644 (file)
--- a/arch/arm/boot/dts/imx53-usbarmory.dts
+++ b/arch/arm/boot/dts/imx53-usbarmory.dts
@@ -67,7 +67,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_led>;
 
-               user {
+               led-user {
                        label = "LED";
                        gpios = <&gpio4 27 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "heartbeat";

diff --git a/arch/arm/boot/dts/imx6dl-b1x5pv2.dtsi b/arch/arm/boot/dts/imx6dl-b1x5pv2.dtsi
index 337db29b0010a9598dd0a45f3c270b32b5c4920d..37697fac9dea9e95c645804ccfc7092151069326 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-b1x5pv2.dtsi
+++ b/arch/arm/boot/dts/imx6dl-b1x5pv2.dtsi
@@ -211,17 +211,17 @@
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_q7_gpio1 &pinctrl_q7_gpio3 &pinctrl_q7_gpio5>;
 
-               alarm1 {
+               led-alarm1 {
                        label = "alarm:red";
                        gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
                };
 
-               alarm2 {
+               led-alarm2 {
                        label = "alarm:yellow";
                        gpios = <&gpio4 27 GPIO_ACTIVE_HIGH>;
                };
 
-               alarm3 {
+               led-alarm3 {
                        label = "alarm:blue";
                        gpios = <&gpio4 15 GPIO_ACTIVE_HIGH>;
                };

diff --git a/arch/arm/boot/dts/imx6dl-riotboard.dts b/arch/arm/boot/dts/imx6dl-riotboard.dts
index e7be05f205d32b6b3f6ac1c81858de4433384639..24c7f535f63bd94c9a54e6fa65fa39df1cbf187d 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-riotboard.dts
+++ b/arch/arm/boot/dts/imx6dl-riotboard.dts
@@ -25,14 +25,14 @@
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_led>;
 
-               led0: user1 {
+               led0: led-user1 {
                        label = "user1";
                        gpios = <&gpio5 2 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                        linux,default-trigger = "heartbeat";
                };
 
-               led1: user2 {
+               led1: led-user2 {
                        label = "user2";
                        gpios = <&gpio3 28 GPIO_ACTIVE_LOW>;
                        default-state = "off";

diff --git a/arch/arm/boot/dts/imx6dl-yapp4-common.dtsi b/arch/arm/boot/dts/imx6dl-yapp4-common.dtsi
index 52162e8c7274b4487073cc21d3fa9b9a21030d1f..aacbf317feea61aca221d7005519f278988b55a3 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-yapp4-common.dtsi
+++ b/arch/arm/boot/dts/imx6dl-yapp4-common.dtsi
@@ -274,7 +274,7 @@
                #address-cells = <1>;
                #size-cells = <0>;
 
-               chan@0 {
+               led@0 {
                        chan-name = "R";
                        led-cur = /bits/ 8 <0x20>;
                        max-cur = /bits/ 8 <0x60>;
@@ -282,7 +282,7 @@
                        color = <LED_COLOR_ID_RED>;
                };
 
-               chan@1 {
+               led@1 {
                        chan-name = "G";
                        led-cur = /bits/ 8 <0x20>;
                        max-cur = /bits/ 8 <0x60>;
@@ -290,7 +290,7 @@
                        color = <LED_COLOR_ID_GREEN>;
                };
 
-               chan@2 {
+               led@2 {
                        chan-name = "B";
                        led-cur = /bits/ 8 <0x20>;
                        max-cur = /bits/ 8 <0x60>;

diff --git a/arch/arm/boot/dts/imx6q-gw5400-a.dts b/arch/arm/boot/dts/imx6q-gw5400-a.dts
index e894faba571f964eb7608bd74f196c31f4f3b795..522a51042965ac9be87e2275b2dca0975525db41 100644 (file)
--- a/arch/arm/boot/dts/imx6q-gw5400-a.dts
+++ b/arch/arm/boot/dts/imx6q-gw5400-a.dts
@@ -34,20 +34,20 @@
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_gpio_leds>;
 
-               led0: user1 {
+               led0: led-user1 {
                        label = "user1";
                        gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>; /* 102 -> MX6_PANLEDG */
                        default-state = "on";
                        linux,default-trigger = "heartbeat";
                };
 
-               led1: user2 {
+               led1: led-user2 {
                        label = "user2";
                        gpios = <&gpio4 10 GPIO_ACTIVE_HIGH>; /* 106 -> MX6_PANLEDR */
                        default-state = "off";
                };
 
-               led2: user3 {
+               led2: led-user3 {
                        label = "user3";
                        gpios = <&gpio4 15 GPIO_ACTIVE_LOW>; /* 111 -> MX6_LOCLED# */
                        default-state = "off";

diff --git a/arch/arm/boot/dts/imx6q-h100.dts b/arch/arm/boot/dts/imx6q-h100.dts
index b8feadbff967dbd6a62778b60be894771f2da108..6406ade14f57b4b99b40a234976d4ff15fc5baa0 100644 (file)
--- a/arch/arm/boot/dts/imx6q-h100.dts
+++ b/arch/arm/boot/dts/imx6q-h100.dts
@@ -76,19 +76,19 @@
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_h100_leds>;
 
-               led0: power {
+               led0: led-power {
                        label = "power";
                        gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
-               led1: stream {
+               led1: led-stream {
                        label = "stream";
                        gpios = <&gpio2 29 GPIO_ACTIVE_LOW>;
                        default-state = "off";
                };
 
-               led2: rec {
+               led2: led-rec {
                        label = "rec";
                        gpios = <&gpio2 28 GPIO_ACTIVE_LOW>;
                        default-state = "off";

diff --git a/arch/arm/boot/dts/imx6q-kp.dtsi b/arch/arm/boot/dts/imx6q-kp.dtsi
index 1ade0bff681d68fe6354ad14be378b49ca3c49ab..5e0ed556004058da72cd6f2931b540e65d09317c 100644 (file)
--- a/arch/arm/boot/dts/imx6q-kp.dtsi
+++ b/arch/arm/boot/dts/imx6q-kp.dtsi
@@ -66,14 +66,14 @@
        leds {
                compatible = "gpio-leds";
 
-               green {
+               led-green {
                        label = "led1";
                        gpios = <&gpio3 16 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "gpio";
                        default-state = "off";
                };
 
-               red {
+               led-red {
                        label = "led0";
                        gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "gpio";

diff --git a/arch/arm/boot/dts/imx6q-marsboard.dts b/arch/arm/boot/dts/imx6q-marsboard.dts
index cc180100239427c8655014e120fe8ee730924e66..2c9961333b0a8656b648c7a848b6c20db61f790e 100644 (file)
--- a/arch/arm/boot/dts/imx6q-marsboard.dts
+++ b/arch/arm/boot/dts/imx6q-marsboard.dts
@@ -73,14 +73,14 @@
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_led>;
 
-               user1 {
+               led-user1 {
                        label = "imx6:green:user1";
                        gpios = <&gpio5 2 GPIO_ACTIVE_LOW>;
                        default-state = "off";
                        linux,default-trigger = "heartbeat";
                };
 
-               user2 {
+               led-user2 {
                        label = "imx6:green:user2";
                        gpios = <&gpio3 28 GPIO_ACTIVE_LOW>;
                        default-state = "off";

diff --git a/arch/arm/boot/dts/imx6q-tbs2910.dts b/arch/arm/boot/dts/imx6q-tbs2910.dts
index 8daef65d5bb3542a0d223d80a198dc26db2af336..2f576e2ce73f2e6be9d63c3fd61e113e344fee94 100644 (file)
--- a/arch/arm/boot/dts/imx6q-tbs2910.dts
+++ b/arch/arm/boot/dts/imx6q-tbs2910.dts
@@ -49,7 +49,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_gpio_leds>;
 
-               blue {
+               led-blue {
                        label = "blue_status_led";
                        gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
                        default-state = "keep";

diff --git a/arch/arm/boot/dts/imx6qdl-emcon.dtsi b/arch/arm/boot/dts/imx6qdl-emcon.dtsi
index 7228b894a763f5be5820ab5233ad4c44893f82e2..ee2dd75cead6dbb6d3433dfebb477600c2463ca8 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-emcon.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-emcon.dtsi
@@ -46,14 +46,14 @@
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_som_leds>;
 
-               green {
+               led-green {
                        label = "som:green";
                        gpios = <&gpio3 0 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "heartbeat";
                        default-state = "on";
                };
 
-               red {
+               led-red {
                        label = "som:red";
                        gpios = <&gpio3 1 GPIO_ACTIVE_LOW>;
                        default-state = "keep";

diff --git a/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
index 069c27fab432c445421e170d39eb236947757b2e..e75e1a5364b8544725ef4d57fbc178f310096cb8 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
@@ -71,14 +71,14 @@
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_gpio_leds>;
 
-               led0: user1 {
+               led0: led-user1 {
                        label = "user1";
                        gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDG */
                        default-state = "on";
                        linux,default-trigger = "heartbeat";
                };
 
-               led1: user2 {
+               led1: led-user2 {
                        label = "user2";
                        gpios = <&gpio4 7 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDR */
                        default-state = "off";

diff --git a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
index 728810b9d677da92f038dc582cfa32ca4386a9ab..47d9a8d08197df067490e3a12157d6bcb4119318 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
@@ -80,20 +80,20 @@
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_gpio_leds>;
 
-               led0: user1 {
+               led0: led-user1 {
                        label = "user1";
                        gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDG */
                        default-state = "on";
                        linux,default-trigger = "heartbeat";
                };
 
-               led1: user2 {
+               led1: led-user2 {
                        label = "user2";
                        gpios = <&gpio4 7 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDR */
                        default-state = "off";
                };
 
-               led2: user3 {
+               led2: led-user3 {
                        label = "user3";
                        gpios = <&gpio4 15 GPIO_ACTIVE_LOW>; /* MX6_LOCLED# */
                        default-state = "off";

diff --git a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
index 6c0c109046d80989c1a0da25978867787dbf6222..fb1d29abe0991644070e668e7336fbd490d69e79 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
@@ -80,20 +80,20 @@
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_gpio_leds>;
 
-               led0: user1 {
+               led0: led-user1 {
                        label = "user1";
                        gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDG */
                        default-state = "on";
                        linux,default-trigger = "heartbeat";
                };
 
-               led1: user2 {
+               led1: led-user2 {
                        label = "user2";
                        gpios = <&gpio4 7 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDR */
                        default-state = "off";
                };
 
-               led2: user3 {
+               led2: led-user3 {
                        label = "user3";
                        gpios = <&gpio4 15 GPIO_ACTIVE_LOW>; /* MX6_LOCLED# */
                        default-state = "off";

diff --git a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
index a9b04f9f1c2bc2ee7587caf86457d482b874a70a..4e20cb97058ebbbb1410f3eed36167a3afc751d9 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
@@ -81,20 +81,20 @@
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_gpio_leds>;
 
-               led0: user1 {
+               led0: led-user1 {
                        label = "user1";
                        gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDG */
                        default-state = "on";
                        linux,default-trigger = "heartbeat";
                };
 
-               led1: user2 {
+               led1: led-user2 {
                        label = "user2";
                        gpios = <&gpio4 7 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDR */
                        default-state = "off";
                };
 
-               led2: user3 {
+               led2: led-user3 {
                        label = "user3";
                        gpios = <&gpio4 15 GPIO_ACTIVE_LOW>; /* MX6_LOCLED# */
                        default-state = "off";

diff --git a/arch/arm/boot/dts/imx6qdl-gw551x.dtsi b/arch/arm/boot/dts/imx6qdl-gw551x.dtsi
index 435dec6338fe68f9d17aad3115c20eb099240bec..0fa4b8eeddee75870ccdf653d370ad33f8196dc1 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-gw551x.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw551x.dtsi
@@ -115,7 +115,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_gpio_leds>;
 
-               led0: user1 {
+               led0: led-user1 {
                        label = "user1";
                        gpios = <&gpio4 7 GPIO_ACTIVE_LOW>;
                        default-state = "on";

diff --git a/arch/arm/boot/dts/imx6qdl-gw552x.dtsi b/arch/arm/boot/dts/imx6qdl-gw552x.dtsi
index 2e61102ae6946593315767bda7b7ed1ae85f734c..77ae611b817a4c18dce02507e9569fa8223d836d 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-gw552x.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw552x.dtsi
@@ -72,20 +72,20 @@
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_gpio_leds>;
 
-               led0: user1 {
+               led0: led-user1 {
                        label = "user1";
                        gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDG */
                        default-state = "on";
                        linux,default-trigger = "heartbeat";
                };
 
-               led1: user2 {
+               led1: led-user2 {
                        label = "user2";
                        gpios = <&gpio4 7 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDR */
                        default-state = "off";
                };
 
-               led2: user3 {
+               led2: led-user3 {
                        label = "user3";
                        gpios = <&gpio4 15 GPIO_ACTIVE_LOW>; /* MX6_LOCLED# */
                        default-state = "off";

diff --git a/arch/arm/boot/dts/imx6qdl-gw553x.dtsi b/arch/arm/boot/dts/imx6qdl-gw553x.dtsi
index 4662408b225a5bb8e9b350af5368d82b106109b7..7f16c602cc0757ab9a1cbd8f19f0d5ad29457495 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-gw553x.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw553x.dtsi
@@ -113,14 +113,14 @@
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_gpio_leds>;
 
-               led0: user1 {
+               led0: led-user1 {
                        label = "user1";
                        gpios = <&gpio4 10 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDG */
                        default-state = "on";
                        linux,default-trigger = "heartbeat";
                };
 
-               led1: user2 {
+               led1: led-user2 {
                        label = "user2";
                        gpios = <&gpio4 11 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDR */
                        default-state = "off";

diff --git a/arch/arm/boot/dts/imx6qdl-gw560x.dtsi b/arch/arm/boot/dts/imx6qdl-gw560x.dtsi
index 4bc4371e6bae56e02ee910b98f0f03656a3b4441..0c31a39d60be042afb84778f3a864b6d14a037be 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-gw560x.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw560x.dtsi
@@ -139,20 +139,20 @@
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_gpio_leds>;
 
-               led0: user1 {
+               led0: led-user1 {
                        label = "user1";
                        gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDG */
                        default-state = "on";
                        linux,default-trigger = "heartbeat";
                };
 
-               led1: user2 {
+               led1: led-user2 {
                        label = "user2";
                        gpios = <&gpio4 7 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDR */
                        default-state = "off";
                };
 
-               led2: user3 {
+               led2: led-user3 {
                        label = "user3";
                        gpios = <&gpio4 15 GPIO_ACTIVE_LOW>; /* MX6_LOCLED# */
                        default-state = "off";

diff --git a/arch/arm/boot/dts/imx6qdl-gw5903.dtsi b/arch/arm/boot/dts/imx6qdl-gw5903.dtsi
index 1fdb7ba630f1be20b4025d0ce802f52dd9274447..a74cde05015894c08543ee34eb380002f5355d6a 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-gw5903.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw5903.dtsi
@@ -123,7 +123,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_gpio_leds>;
 
-               led0: user1 {
+               led0: led-user1 {
                        label = "user1";
                        gpios = <&gpio6 14 GPIO_ACTIVE_LOW>; /* MX6_LOCLED# */
                        default-state = "off";

diff --git a/arch/arm/boot/dts/imx6qdl-gw5904.dtsi b/arch/arm/boot/dts/imx6qdl-gw5904.dtsi
index 612b6e068e282284dd9899fc47ebfefed96a8844..9fc79af2bc9aa18969a2bfe39369e7e83aca7875 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-gw5904.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw5904.dtsi
@@ -120,20 +120,20 @@
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_gpio_leds>;
 
-               led0: user1 {
+               led0: led-user1 {
                        label = "user1";
                        gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDG */
                        default-state = "on";
                        linux,default-trigger = "heartbeat";
                };
 
-               led1: user2 {
+               led1: led-user2 {
                        label = "user2";
                        gpios = <&gpio4 7 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDR */
                        default-state = "off";
                };
 
-               led2: user3 {
+               led2: led-user3 {
                        label = "user3";
                        gpios = <&gpio4 15 GPIO_ACTIVE_LOW>; /* MX6_LOCLED# */
                        default-state = "off";

diff --git a/arch/arm/boot/dts/imx6qdl-gw5907.dtsi b/arch/arm/boot/dts/imx6qdl-gw5907.dtsi
index fcd3bdfd6182724b2d081f56ca82e61f5586a6b8..955a51226eda7566e17bdb891bf964badea8000d 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-gw5907.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw5907.dtsi
@@ -71,14 +71,14 @@
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_gpio_leds>;
 
-               led0: user1 {
+               led0: led-user1 {
                        label = "user1";
                        gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDG */
                        default-state = "on";
                        linux,default-trigger = "heartbeat";
                };
 
-               led1: user2 {
+               led1: led-user2 {
                        label = "user2";
                        gpios = <&gpio4 7 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDR */
                        default-state = "off";

diff --git a/arch/arm/boot/dts/imx6qdl-gw5910.dtsi b/arch/arm/boot/dts/imx6qdl-gw5910.dtsi
index 6bb4855d13ce51ec179d82c622b1b24e05d15cfe..218d6e667ed24a4fb89553e31bc30ffb8d3ee50a 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-gw5910.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw5910.dtsi
@@ -74,20 +74,20 @@
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_gpio_leds>;
 
-               led0: user1 {
+               led0: led-user1 {
                        label = "user1";
                        gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDG */
                        default-state = "on";
                        linux,default-trigger = "heartbeat";
                };
 
-               led1: user2 {
+               led1: led-user2 {
                        label = "user2";
                        gpios = <&gpio4 7 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDR */
                        default-state = "off";
                };
 
-               led2: user3 {
+               led2: led-user3 {
                        label = "user3";
                        gpios = <&gpio4 15 GPIO_ACTIVE_LOW>; /* MX6_LOCLED# */
                        default-state = "off";

diff --git a/arch/arm/boot/dts/imx6qdl-gw5912.dtsi b/arch/arm/boot/dts/imx6qdl-gw5912.dtsi
index 0415bcb416400d9e81b6cbd788fcd22c4a3072a4..40e235e315cc45b9740a47dbb0f1c6b262fa9837 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-gw5912.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw5912.dtsi
@@ -72,20 +72,20 @@
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_gpio_leds>;
 
-               led0: user1 {
+               led0: led-user1 {
                        label = "user1";
                        gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDG */
                        default-state = "on";
                        linux,default-trigger = "heartbeat";
                };
 
-               led1: user2 {
+               led1: led-user2 {
                        label = "user2";
                        gpios = <&gpio4 7 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDR */
                        default-state = "off";
                };
 
-               led2: user3 {
+               led2: led-user3 {
                        label = "user3";
                        gpios = <&gpio4 15 GPIO_ACTIVE_LOW>; /* MX6_LOCLED# */
                        default-state = "off";

diff --git a/arch/arm/boot/dts/imx6qdl-gw5913.dtsi b/arch/arm/boot/dts/imx6qdl-gw5913.dtsi
index 696427b487f0122a8e31af2c931dd4f32754e062..82f47c295b08559c69129fc073565fa6c24ca33f 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-gw5913.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw5913.dtsi
@@ -71,14 +71,14 @@
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_gpio_leds>;
 
-               led0: user1 {
+               led0: led-user1 {
                        label = "user1";
                        gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDG */
                        default-state = "on";
                        linux,default-trigger = "heartbeat";
                };
 
-               led1: user2 {
+               led1: led-user2 {
                        label = "user2";
                        gpios = <&gpio4 7 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDR */
                        default-state = "off";

diff --git a/arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi b/arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi
index a53a5d0766a5126c9de7f8512105fd04866e8b86..6d4eab1942b948321e6f1bac9dc287a73752e4d0 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi
@@ -85,31 +85,31 @@
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_leds>;
 
-               j14-pin1 {
+               led-j14-pin1 {
                        gpios = <&gpio1 2 GPIO_ACTIVE_LOW>;
                        retain-state-suspended;
                        default-state = "off";
                };
 
-               j14-pin3 {
+               led-j14-pin3 {
                        gpios = <&gpio1 3 GPIO_ACTIVE_LOW>;
                        retain-state-suspended;
                        default-state = "off";
                };
 
-               j14-pins8-9 {
+               led-j14-pins8-9 {
                        gpios = <&gpio3 29 GPIO_ACTIVE_LOW>;
                        retain-state-suspended;
                        default-state = "off";
                };
 
-               j46-pin2 {
+               led-j46-pin2 {
                        gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
                        retain-state-suspended;
                        default-state = "off";
                };
 
-               j46-pin3 {
+               led-j46-pin3 {
                        gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
                        retain-state-suspended;
                        default-state = "off";

diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
index 57c21a01f126d9d78714a4ab5b7fd0eaeca56d40..81a9a302aec1b531867f2f7674a2b3d79cab4414 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
@@ -181,13 +181,13 @@
        leds {
                compatible = "gpio-leds";
 
-               speaker-enable {
+               led-speaker-enable {
                        gpios = <&gpio1 29 GPIO_ACTIVE_HIGH>;
                        retain-state-suspended;
                        default-state = "off";
                };
 
-               ttymxc4-rs232 {
+               led-ttymxc4-rs232 {
                        gpios = <&gpio6 10 GPIO_ACTIVE_HIGH>;
                        retain-state-suspended;
                        default-state = "on";

diff --git a/arch/arm/boot/dts/imx6qdl-phytec-mira.dtsi b/arch/arm/boot/dts/imx6qdl-phytec-mira.dtsi
index 120d6e997a4c5c55b505fc14a723db2aac066f27..1a599c294ab863e2c160f23a9e59da6b1ed79b66 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-phytec-mira.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-phytec-mira.dtsi
@@ -25,17 +25,17 @@
                pinctrl-0 = <&pinctrl_gpioleds>;
                status = "disabled";
 
-               red {
+               led-red {
                        label = "phyboard-mira:red";
                        gpios = <&gpio5 22 GPIO_ACTIVE_HIGH>;
                };
 
-               green {
+               led-green {
                        label = "phyboard-mira:green";
                        gpios = <&gpio5 23 GPIO_ACTIVE_HIGH>;
                };
 
-               blue {
+               led-blue {
                        label = "phyboard-mira:blue";
                        gpios = <&gpio5 24 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "mmc0";

diff --git a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
index 768bc0e3a2b3889d0eef18971eafc158147c37f5..80adb2a02cc94164d00491703d62d98f517d4d5d 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
@@ -47,12 +47,12 @@
                pinctrl-0 = <&pinctrl_leds>;
                compatible = "gpio-leds";
 
-               led_green: green {
+               led_green: led-green {
                        label = "phyflex:green";
                        gpios = <&gpio1 30 0>;
                };
 
-               led_red: red {
+               led_red: led-red {
                        label = "phyflex:red";
                        gpios = <&gpio2 31 0>;
                };

diff --git a/arch/arm/boot/dts/imx6qdl-rex.dtsi b/arch/arm/boot/dts/imx6qdl-rex.dtsi
index de514eb5aa99db4d47bf6d5082cedd3f760a367c..f804ff95a6ad6594942029950720da9286b7460c 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-rex.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-rex.dtsi
@@ -55,7 +55,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_led>;
 
-               led0: usr {
+               led0: led-usr {
                        label = "usr";
                        gpios = <&gpio1 2 GPIO_ACTIVE_LOW>;
                        default-state = "off";

diff --git a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
index eebcfe12142e2c7566c9f0eff58e9096bc5205aa..f79caa36f3d25e3cbac03cac74b3ebf2e20cc399 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
@@ -21,7 +21,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_gpio_leds>;
 
-               user {
+               led-user {
                        label = "debug";
                        gpios = <&gpio5 15 GPIO_ACTIVE_HIGH>;
                };

diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
index 09f4c2fa3ad6c61456e26c22103c5308c30b3e4f..53b080c97f2d990628515dba97f87c6f896f5262 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
@@ -130,7 +130,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_gpio_leds>;
 
-               red {
+               led-red {
                        gpios = <&gpio1 2 0>;
                        default-state = "on";
                };

diff --git a/arch/arm/boot/dts/imx6qdl-ts7970.dtsi b/arch/arm/boot/dts/imx6qdl-ts7970.dtsi
index c096d25a6f5b54f56289075d1041a3ad84aa804c..1e0a041e9f60a622d476b4a7d1d368c457703139 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-ts7970.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-ts7970.dtsi
@@ -73,13 +73,13 @@
                        default-state = "off";
                };
 
-               en-usb-5v {
+               en-usb-5v-led {
                        label = "en-usb-5v";
                        gpios = <&gpio2 22 GPIO_ACTIVE_HIGH>;
                        default-state = "on";
                };
 
-               sel_dc_usb {
+               sel-dc-usb-led {
                        label = "sel_dc_usb";
                        gpios = <&gpio5 17 GPIO_ACTIVE_HIGH>;
                        default-state = "off";

diff --git a/arch/arm/boot/dts/imx6qdl-tx6.dtsi b/arch/arm/boot/dts/imx6qdl-tx6.dtsi
index f41f86a76ea9571f3773d4a7915ae39482a60530..a197bac95cbace8b32c5bbbd298fb256302f24c7 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-tx6.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-tx6.dtsi
@@ -92,7 +92,7 @@
        leds {
                compatible = "gpio-leds";
 
-               user_led: user {
+               user_led: led-user {
                        label = "Heartbeat";
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_user_led>;

diff --git a/arch/arm/boot/dts/imx6sl-evk.dts b/arch/arm/boot/dts/imx6sl-evk.dts
index f16c830f1e9188d7877f937cfb71cdaeda099939..dc5d596c18db4788015c6c5b2d9bc5998e36da3a 100644 (file)
--- a/arch/arm/boot/dts/imx6sl-evk.dts
+++ b/arch/arm/boot/dts/imx6sl-evk.dts
@@ -33,7 +33,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_led>;
 
-               user {
+               led-user {
                        label = "debug";
                        gpios = <&gpio3 20 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "heartbeat";

diff --git a/arch/arm/boot/dts/imx6sll-evk.dts b/arch/arm/boot/dts/imx6sll-evk.dts
index 32b3d82fec53c37c703d0a5a9fafecf9a16437da..269092ac881c5c4e70e5fbbf8992ec7246ac4f6a 100644 (file)
--- a/arch/arm/boot/dts/imx6sll-evk.dts
+++ b/arch/arm/boot/dts/imx6sll-evk.dts
@@ -37,7 +37,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_led>;
 
-               user {
+               led-user {
                        label = "debug";
                        gpios = <&gpio2 4 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "heartbeat";

diff --git a/arch/arm/boot/dts/imx6sx-sabreauto.dts b/arch/arm/boot/dts/imx6sx-sabreauto.dts
index 83ee97252ff11fd1266985713e67ea451512f1e1..b0c27b9b02446b400c7eebe69fb0b6350d61d84b 100644 (file)
--- a/arch/arm/boot/dts/imx6sx-sabreauto.dts
+++ b/arch/arm/boot/dts/imx6sx-sabreauto.dts
@@ -20,7 +20,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_led>;
 
-               user {
+               led-user {
                        label = "debug";
                        gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "heartbeat";

diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi b/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi
index c84ea1fac5e98dd3206cbee2e02e80b3f84ded23..725d0b5cb55f6a4e3fd50bb1d7ca521dfb3039cb 100644 (file)
--- a/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi
+++ b/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi
@@ -15,14 +15,14 @@
        leds {
                compatible = "gpio-leds";
 
-               red {
+               led-red {
                        label = "udoo-neo:red:mmc";
                        gpios = <&gpio6 0 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                        linux,default-trigger = "mmc0";
                };
 
-               orange {
+               led-orange {
                        label = "udoo-neo:orange:user";
                        gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>;
                        default-state = "keep";

diff --git a/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi b/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi
index 5168ed0ffec375f52925b3a3b3c71b5304b879d8..a3ea1b20846253b8c4a5dc3a0ff0d505c24be3ff 100644 (file)
--- a/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi
+++ b/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi
@@ -30,7 +30,7 @@
                pinctrl-0 = <&pinctrl_gpioleds_som>;
                compatible = "gpio-leds";
 
-               phycore-green {
+               led-phycore-green {
                        gpios = <&gpio5 4 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "heartbeat";
                };

diff --git a/arch/arm/boot/dts/imx6ul-tx6ul.dtsi b/arch/arm/boot/dts/imx6ul-tx6ul.dtsi
index 15ee0275feaffd89920809d051a837d3a623afab..70cef5e817bd107f38d0b367fb1c99c28265ce32 100644 (file)
--- a/arch/arm/boot/dts/imx6ul-tx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul-tx6ul.dtsi
@@ -131,7 +131,7 @@
        leds {
                compatible = "gpio-leds";
 
-               user_led: user {
+               user_led: led-user {
                        label = "Heartbeat";
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_led>;