ARM: dts: sunxi: Fix the LED node names

According to the LED bindings, the LED node names are supposed to be led
plus an optional suffix. Let's fix our users to use that new scheme.

Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Acked-by: Jernej Skrabec <jernej.skrabec@siol.net>
Acked-by: Chen-Yu Tsai <wens@csie.org>
Link: https://lore.kernel.org/r/20210114113538.1233933-6-maxime@cerno.tech

diff --git a/arch/arm/boot/dts/sun4i-a10-a1000.dts b/arch/arm/boot/dts/sun4i-a10-a1000.dts
index af8ab736fd3c7c85ba5042bcfbdb76b987c1ce8c..20f9ed244851f07ffca2c4361dff1600ddb00f6f 100644 (file)
--- a/arch/arm/boot/dts/sun4i-a10-a1000.dts
+++ b/arch/arm/boot/dts/sun4i-a10-a1000.dts
@@ -74,12 +74,12 @@
        leds {
                compatible = "gpio-leds";
 
-               red {
+               led-0 {
                        label = "a1000:red:usr";
                        gpios = <&pio 7 10 GPIO_ACTIVE_HIGH>;
                };
 
-               blue {
+               led-1 {
                        label = "a1000:blue:pwr";
                        gpios = <&pio 7 20 GPIO_ACTIVE_HIGH>;
                        default-state = "on";

diff --git a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
index 6ca02e824accb0c14ca11c0410852d13c2c3f4e2..0645d606423557b39cf31b9a2a3a6d8befb3c096 100644 (file)
--- a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
+++ b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
@@ -75,12 +75,12 @@
                pinctrl-names = "default";
                pinctrl-0 = <&led_pins_cubieboard>;
 
-               blue {
+               led-0 {
                        label = "cubieboard:blue:usr";
                        gpios = <&pio 7 21 GPIO_ACTIVE_HIGH>; /* LED1 */
                };
 
-               green {
+               led-1 {
                        label = "cubieboard:green:usr";
                        gpios = <&pio 7 20 GPIO_ACTIVE_HIGH>; /* LED2 */
                        linux,default-trigger = "heartbeat";

diff --git a/arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts b/arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts
index 8a7b4c53d278c5e6942fddf0e5ce9190034b4808..1aeb0bd5519e1640936521ab3db6783c9a3712e5 100644 (file)
--- a/arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts
+++ b/arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts
@@ -63,7 +63,7 @@
        leds {
                compatible = "gpio-leds";
 
-               green {
+               led {
                        label = "q5:green:usr";
                        gpios = <&pio 7 20 GPIO_ACTIVE_HIGH>;  /* PH20 */
                };

diff --git a/arch/arm/boot/dts/sun4i-a10-marsboard.dts b/arch/arm/boot/dts/sun4i-a10-marsboard.dts
index a843e57530ed9d84b1f60b0a6da2a54c69b8d52b..81fdb217d339b43c513c38eb9a669b603abedbcf 100644 (file)
--- a/arch/arm/boot/dts/sun4i-a10-marsboard.dts
+++ b/arch/arm/boot/dts/sun4i-a10-marsboard.dts
@@ -62,22 +62,22 @@
        leds {
                compatible = "gpio-leds";
 
-               red1 {
+               led-0 {
                        label = "marsboard:red1:usr";
                        gpios = <&pio 1 5 GPIO_ACTIVE_HIGH>;
                };
 
-               red2 {
+               led-1 {
                        label = "marsboard:red2:usr";
                        gpios = <&pio 1 6 GPIO_ACTIVE_HIGH>;
                };
 
-               red3 {
+               led-2 {
                        label = "marsboard:red3:usr";
                        gpios = <&pio 1 7 GPIO_ACTIVE_HIGH>;
                };
 
-               red4 {
+               led-3 {
                        label = "marsboard:red4:usr";
                        gpios = <&pio 1 8 GPIO_ACTIVE_HIGH>;
                };

diff --git a/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts b/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
index 845f76824d57459fdbb1e57d39ab61852c358f56..ad0e25af45be4616cb68da56d06fe5bd9036f476 100644 (file)
--- a/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
+++ b/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
@@ -74,7 +74,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&led_pins_olinuxinolime>;
 
-               green {
+               led {
                        label = "a10-olinuxino-lime:green:usr";
                        gpios = <&pio 7 2 GPIO_ACTIVE_HIGH>;
                        default-state = "on";

diff --git a/arch/arm/boot/dts/sun4i-a10-pcduino.dts b/arch/arm/boot/dts/sun4i-a10-pcduino.dts
index 83287b6c975e72295dab30903e99734960257115..1ac82376baef159e3b10d58cf444c2df1f5a5314 100644 (file)
--- a/arch/arm/boot/dts/sun4i-a10-pcduino.dts
+++ b/arch/arm/boot/dts/sun4i-a10-pcduino.dts
@@ -63,12 +63,12 @@
        leds {
                compatible = "gpio-leds";
 
-               tx {
+               led-0 {
                        label = "pcduino:green:tx";
                        gpios = <&pio 7 15 GPIO_ACTIVE_LOW>;
                };
 
-               rx {
+               led-1 {
                        label = "pcduino:green:rx";
                        gpios = <&pio 7 16 GPIO_ACTIVE_LOW>;
                };

diff --git a/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts b/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts
index 64d50fcfcd3a2dff1ff6ed3f67a94225a5dcf161..04b0e6d28769670c994665d1091a121853c07ad6 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts
@@ -62,7 +62,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&led_pins_t003>;
 
-               red {
+               led {
                        label = "t003-tv-dongle:red:usr";
                        gpios = <&pio 1 2 GPIO_ACTIVE_HIGH>; /* PB2 */
                        default-state = "on";

diff --git a/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts b/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
index 8af0eae2ddc195a90d5820ffd7b61ea5ad69b879..667bc2dc1ea975ff54c15d0dc838a9c00bec7f33 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
@@ -62,7 +62,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&led_pins_t004>;
 
-               red {
+               led {
                        label = "t004-tv-dongle:red:usr";
                        gpios = <&pio 1 2 GPIO_ACTIVE_HIGH>; /* PB2 */
                        default-state = "on";

diff --git a/arch/arm/boot/dts/sun5i-a10s-mk802.dts b/arch/arm/boot/dts/sun5i-a10s-mk802.dts
index 6e90ccb267aaa51cf3ed1d843966e614c45f6332..d0219404c231094625aad34cfc5875a628cbac7d 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a10s-mk802.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-mk802.dts
@@ -60,7 +60,7 @@
        leds {
                compatible = "gpio-leds";
 
-               red {
+               led {
                        label = "mk802:red:usr";
                        gpios = <&pio 1 2 GPIO_ACTIVE_HIGH>; /* PB2 */
                };

diff --git a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
index d6bb82c295f0e5c6d92b91e6cdf121843044e2c0..5832bb31fc51f9a606dd16547cde19406380628b 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
@@ -79,7 +79,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&led_pins_olinuxino>;
 
-               green {
+               led {
                        label = "a10s-olinuxino-micro:green:usr";
                        gpios = <&pio 4 3 GPIO_ACTIVE_HIGH>;
                        default-state = "on";

diff --git a/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts b/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts
index b2a49a216ebf864df3a5e52566da6cd555ca2a64..964360f0610a8b6947e91589ab35455ad6ac1b1f 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts
@@ -63,7 +63,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&led_pins_r7>;
 
-               green {
+               led {
                        label = "r7-tv-dongle:green:usr";
                        gpios = <&pio 1 2 GPIO_ACTIVE_HIGH>;
                        default-state = "on";

diff --git a/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts b/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts
index 1f74ba1634cc69c2731022b69feffb81d6ea1cb9..ef8baa992687784b9a38120fa0b41b79bfeeba5f 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts
@@ -62,7 +62,7 @@
        leds {
                compatible = "gpio-leds";
 
-               blue {
+               led {
                        label = "a10s-wobo-i5:blue:usr";
                        gpios = <&pio 1 2 GPIO_ACTIVE_HIGH>;
                        default-state = "on";

diff --git a/arch/arm/boot/dts/sun5i-a13-licheepi-one.dts b/arch/arm/boot/dts/sun5i-a13-licheepi-one.dts
index ba8d75b3c716c07dc2149c4c72c593959cbaeb44..2ce361f8fede937cf9c0012dad4b5dfe8785b4cf 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a13-licheepi-one.dts
+++ b/arch/arm/boot/dts/sun5i-a13-licheepi-one.dts
@@ -66,18 +66,18 @@
        leds {
                compatible = "gpio-leds";
 
-               red {
+               led-0 {
                        label ="licheepi:red:usr";
                        gpios = <&pio 2 5 GPIO_ACTIVE_LOW>;
                };
 
-               green {
+               led-1 {
                        label ="licheepi:green:usr";
                        gpios = <&pio 2 19 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
-               blue {
+               led-2 {
                        label ="licheepi:blue:usr";
                        gpios = <&pio 2 4 GPIO_ACTIVE_LOW>;
                };

diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
index 5df398d7723884777e20eb5892f1f081ed8af3fe..bfe1075e62cc9e2e4c79d2a45bb2192004888e2e 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
@@ -64,7 +64,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&led_pins_olinuxinom>;
 
-               power {
+               led {
                        label = "a13-olinuxino-micro:green:power";
                        gpios = <&pio 6 9 GPIO_ACTIVE_HIGH>;
                        default-state = "on";

diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
index 39101228a7556a1996d2ac0cafd20712032ab2ef..fadeae3cd8bbd773698543bf85fbaa28d4e81814 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
+++ b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
@@ -66,7 +66,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&led_pins_olinuxino>;
 
-               power {
+               led {
                        gpios = <&pio 6 9 GPIO_ACTIVE_HIGH>;
                        default-state = "on";
                };

diff --git a/arch/arm/boot/dts/sun5i-a13-pocketbook-touch-lux-3.dts b/arch/arm/boot/dts/sun5i-a13-pocketbook-touch-lux-3.dts
index e9ef97c9c893b6a819fdd9b3cd14a3417c449ae8..3428bebceff0873076e6e28999789a325df57f9d 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a13-pocketbook-touch-lux-3.dts
+++ b/arch/arm/boot/dts/sun5i-a13-pocketbook-touch-lux-3.dts
@@ -37,7 +37,7 @@
        leds {
                compatible = "gpio-leds";
 
-               power {
+               led {
                        gpios = <&pio 4 8 GPIO_ACTIVE_LOW>; /* PE8 */
                        default-state = "on";
                };

diff --git a/arch/arm/boot/dts/sun6i-a31-i7.dts b/arch/arm/boot/dts/sun6i-a31-i7.dts
index 6cc8ccf53d886e9f9c90bee9f4f0a7d5f61a6178..744723d956f0d998d2e7da5131b3e8ec5e543810 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31-i7.dts
+++ b/arch/arm/boot/dts/sun6i-a31-i7.dts
@@ -72,7 +72,7 @@
        leds {
                compatible = "gpio-leds";
 
-               blue {
+               led {
                        label = "i7:blue:usr";
                        gpios = <&pio 7 13 GPIO_ACTIVE_HIGH>;
                };

diff --git a/arch/arm/boot/dts/sun6i-a31-m9.dts b/arch/arm/boot/dts/sun6i-a31-m9.dts
index a645c8f4257c039b7410d9d52d998faea9ade243..aff716b523c4aa297cc387188d63da5d4375587c 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31-m9.dts
+++ b/arch/arm/boot/dts/sun6i-a31-m9.dts
@@ -61,7 +61,7 @@
        leds {
                compatible = "gpio-leds";
 
-               blue {
+               led {
                        label = "m9:blue:pwr";
                        gpios = <&pio 7 13 GPIO_ACTIVE_HIGH>;
                        default-state = "on";

diff --git a/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts b/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts
index 648f247462344de4851f1a13ff2bbf58905116a2..959ed9ce4b483f50e1ee508eefc43af5ae637e7f 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts
+++ b/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts
@@ -61,7 +61,7 @@
        leds {
                compatible = "gpio-leds";
 
-               blue {
+               led {
                        label = "a1000g:blue:pwr";
                        gpios = <&pio 7 13 GPIO_ACTIVE_HIGH>;
                        default-state = "on";

diff --git a/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts b/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
index 367006fb280db1628fef6d9d7b07f862b2efa193..b4ce60a3b19441497db48c44cb325edb41113209 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
@@ -59,17 +59,17 @@
        leds {
                compatible = "gpio-leds";
 
-               blue {
+               led-0 {
                        label = "bpi-m2:blue:usr";
                        gpios = <&pio 6 11 GPIO_ACTIVE_HIGH>; /* PG11 */
                };
 
-               green {
+               led-1 {
                        label = "bpi-m2:green:usr";
                        gpios = <&pio 6 10 GPIO_ACTIVE_HIGH>; /* PG10 */
                };
 
-               red {
+               led-2 {
                        label = "bpi-m2:red:usr";
                        gpios = <&pio 6 5 GPIO_ACTIVE_HIGH>; /* PG5 */
                };

diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
index 8945dbb114a2af34f8d7eb3cf28eccf606d2a6c6..caa935ca4f190bccf9f8ddac7ab8ddb89bb6633e 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
+++ b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
@@ -74,12 +74,12 @@
        leds {
                compatible = "gpio-leds";
 
-               green {
+               led-0 {
                        label = "bananapi-m1-plus:green:usr";
                        gpios = <&pio 7 24 GPIO_ACTIVE_HIGH>;
                };
 
-               pwr {
+               led-1 {
                        label = "bananapi-m1-plus:pwr:usr";
                        gpios = <&pio 7 25 GPIO_ACTIVE_HIGH>;
                        default-state = "on";

diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi.dts b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
index 0b3d9ae756503450fadb0108e4e4cb113ef55162..9d792d7a0f92a3e71ac036c99aee147cedb4dd1a 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-bananapi.dts
+++ b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
@@ -77,7 +77,7 @@
        leds {
                compatible = "gpio-leds";
 
-               green {
+               led {
                        label = "bananapi:green:usr";
                        gpios = <&pio 7 24 GPIO_ACTIVE_HIGH>;
                };

diff --git a/arch/arm/boot/dts/sun7i-a20-bananapro.dts b/arch/arm/boot/dts/sun7i-a20-bananapro.dts
index 01ccff756996d83ac7d843f6fe61d7dcab5bad37..042badd50b428087f502b6594478b2edeb2b0750 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-bananapro.dts
+++ b/arch/arm/boot/dts/sun7i-a20-bananapro.dts
@@ -63,12 +63,12 @@
        leds {
                compatible = "gpio-leds";
 
-               blue {
+               led-0 {
                        label = "bananapro:blue:usr";
                        gpios = <&pio 6 2 GPIO_ACTIVE_HIGH>;
                };
 
-               green {
+               led-1 {
                        label = "bananapro:green:usr";
                        gpios = <&pio 7 24 GPIO_ACTIVE_HIGH>;
                };

diff --git a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
index b8203e4ef21c975daa9fbd1ba19f5366d15952b2..e35e6990c4b2d2550f72f167f55ef44e21347940 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
+++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
@@ -75,12 +75,12 @@
        leds {
                compatible = "gpio-leds";
 
-               blue {
+               led-0 {
                        label = "cubieboard2:blue:usr";
                        gpios = <&pio 7 21 GPIO_ACTIVE_HIGH>;
                };
 
-               green {
+               led-1 {
                        label = "cubieboard2:green:usr";
                        gpios = <&pio 7 20 GPIO_ACTIVE_HIGH>;
                };

diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
index 9109ca0919ade3a4ad4a17983d7a9ab7493c32d3..52160e3683049aa83e4c106e8506a04a87691fef 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
+++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
@@ -75,22 +75,22 @@
        leds {
                compatible = "gpio-leds";
 
-               blue {
+               led-0 {
                        label = "cubietruck:blue:usr";
                        gpios = <&pio 7 21 GPIO_ACTIVE_HIGH>;
                };
 
-               orange {
+               led-1 {
                        label = "cubietruck:orange:usr";
                        gpios = <&pio 7 20 GPIO_ACTIVE_HIGH>;
                };
 
-               white {
+               led-2 {
                        label = "cubietruck:white:usr";
                        gpios = <&pio 7 11 GPIO_ACTIVE_HIGH>;
                };
 
-               green {
+               led-3 {
                        label = "cubietruck:green:usr";
                        gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>;
                };

diff --git a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
index 358ed5f1b1c1c1482fbaf75dcbab173cf37f1333..b21ddd0ec1c2218210e4b1ab517976fe7c24b1c9 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
+++ b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
@@ -62,12 +62,12 @@
        leds {
                compatible = "gpio-leds";
 
-               red {
+               led-0 {
                        label = "i12_tvbox:red:usr";
                        gpios = <&pio 7 9 GPIO_ACTIVE_LOW>;
                };
 
-               blue {
+               led-1 {
                        label = "i12_tvbox:blue:usr";
                        gpios = <&pio 7 20 GPIO_ACTIVE_HIGH>;
                };

diff --git a/arch/arm/boot/dts/sun7i-a20-itead-ibox.dts b/arch/arm/boot/dts/sun7i-a20-itead-ibox.dts
index 946c272783210f45aaf40b16efaff25f5b4c9af8..8ff83016ff5af164dc09c16770baad699e837ac1 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-itead-ibox.dts
+++ b/arch/arm/boot/dts/sun7i-a20-itead-ibox.dts
@@ -53,13 +53,13 @@
                pinctrl-names = "default";
                pinctrl-0 = <&led_pins_itead_core>;
 
-               green {
+               led-0 {
                        label = "itead_core:green:usr";
                        gpios = <&pio 7 20 GPIO_ACTIVE_HIGH>;
                        default-state = "on";
                };
 
-               blue {
+               led-1 {
                        label = "itead_core:blue:usr";
                        gpios = <&pio 7 21 GPIO_ACTIVE_HIGH>;
                        default-state = "on";

diff --git a/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts b/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
index 17fa8901fc002e6f045c826ab47106f330b12e2b..97518afe4658af5aac8d1e78c46e4c2c66ce3459 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
+++ b/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
@@ -75,7 +75,7 @@
        leds {
                compatible = "gpio-leds";
 
-               green {
+               led {
                        label = "lamobo_r1:green:usr";
                        gpios = <&pio 7 24 GPIO_ACTIVE_HIGH>;
                };

diff --git a/arch/arm/boot/dts/sun7i-a20-m3.dts b/arch/arm/boot/dts/sun7i-a20-m3.dts
index 6bff9e731fc34455313002684d78b8c255fac5a0..f161d523886048380347dcf7f51eda374185d094 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-m3.dts
+++ b/arch/arm/boot/dts/sun7i-a20-m3.dts
@@ -64,7 +64,7 @@
        leds {
                compatible = "gpio-leds";
 
-               blue {
+               led {
                        label = "m3:blue:usr";
                        gpios = <&pio 7 20 GPIO_ACTIVE_HIGH>;
                };

diff --git a/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts b/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
index 6f9c54b8e49a5a5cd5b6d0fae1eeb84a82286998..f05ee32bc9cb6abb97bf930738a8a372e1097b89 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
@@ -75,7 +75,7 @@
        leds {
                compatible = "gpio-leds";
 
-               green {
+               led {
                        label = "a20-olimex-som-evb:green:usr";
                        gpios = <&pio 7 2 GPIO_ACTIVE_HIGH>;
                        default-state = "on";

diff --git a/arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts b/arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts
index 230d62a6b8f10a6b34782e4b2e6b3581cca2880a..54af6c18075b50dca6f008e0d5f3d61333ddde41 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts
@@ -46,19 +46,19 @@
        leds {
                compatible = "gpio-leds";
 
-               stat {
+               led-0 {
                        label = "a20-som204-evb:green:stat";
                        gpios = <&pio 8 0 GPIO_ACTIVE_HIGH>;
                        default-state = "on";
                };
 
-               led1 {
+               led-1 {
                        label = "a20-som204-evb:green:led1";
                        gpios = <&pio 8 10 GPIO_ACTIVE_HIGH>;
                        default-state = "on";
                };
 
-               led2 {
+               led-2 {
                        label = "a20-som204-evb:yellow:led2";
                        gpios = <&pio 8 11 GPIO_ACTIVE_HIGH>;
                        default-state = "on";

diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
index 2adbac8601193bac874ebcd3c83310f2727261eb..92938d0222956bd320d560ad1701a7e4d1879759 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
@@ -78,7 +78,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&led_pins_olinuxinolime>;
 
-               green {
+               led {
                        label = "a20-olinuxino-lime:green:usr";
                        gpios = <&pio 7 2 GPIO_ACTIVE_HIGH>;
                        default-state = "on";

diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
index 9ba62774e89a152365eb71e058e1f4a38910dd42..8077f1716fbc81440d4e39fbcf99875f67d51453 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
@@ -75,7 +75,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&led_pins_olinuxinolime>;
 
-               green {
+               led {
                        label = "a20-olinuxino-lime2:green:usr";
                        gpios = <&pio 7 2 GPIO_ACTIVE_HIGH>;
                        default-state = "on";

diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
index 359bd0d5b3b1e59f76fc7a649f1d3aae616f052b..a1b89b2a2999426a85d42dd312097bd200cd36b8 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
@@ -82,7 +82,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&led_pins_olinuxino>;
 
-               green {
+               led {
                        label = "a20-olinuxino-micro:green:usr";
                        gpios = <&pio 7 2 GPIO_ACTIVE_HIGH>;
                        default-state = "on";

diff --git a/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts b/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts
index 2e328d2cefc1909e38ea7abd8e2d56926d604376..84efa01e7cba04b9e9d46fe0b519301d413e0986 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts
+++ b/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts
@@ -75,12 +75,12 @@
        leds {
                compatible = "gpio-leds";
 
-               green {
+               led-0 {
                        label = "orangepi:green:usr";
                        gpios = <&pio 7 24 GPIO_ACTIVE_HIGH>; /* PH24 */
                };
 
-               blue {
+               led-1 {
                        label = "orangepi:blue:usr";
                        gpios = <&pio 7 25 GPIO_ACTIVE_HIGH>; /* PH25 */
                };

diff --git a/arch/arm/boot/dts/sun7i-a20-orangepi.dts b/arch/arm/boot/dts/sun7i-a20-orangepi.dts
index d75b2e2bab282208501c5416cca89b98533a2443..5d77f1d9818f99bca7ab34672a070dfd7b78c485 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-orangepi.dts
+++ b/arch/arm/boot/dts/sun7i-a20-orangepi.dts
@@ -64,7 +64,7 @@
        leds {
                compatible = "gpio-leds";
 
-               green {
+               led {
                        label = "orangepi:green:usr";
                        gpios = <&pio 7 24 GPIO_ACTIVE_HIGH>; /* PH24 */
                };

diff --git a/arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts b/arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts
index bf38c66c1815b590aef586e351a302cae11b7792..e40ecb48d726e7f09a7defae47419e0c62fb6abc 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts
+++ b/arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts
@@ -72,14 +72,12 @@
        leds {
                compatible = "gpio-leds";
 
-               /* Marked "LED3" on the PCB. */
-               usr1 {
+               led-3 {
                        label = "pcduino3-nano:green:usr1";
                        gpios = <&pio 7 16 GPIO_ACTIVE_LOW>; /* PH16 */
                };
 
-               /* Marked "LED4" on the PCB. */
-               usr2 {
+               led-4 {
                        label = "pcduino3-nano:green:usr2";
                        gpios = <&pio 7 15 GPIO_ACTIVE_LOW>; /* PH15 */
                };

diff --git a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
index cc8271d777b8e03628b77100c944a7f39c71bfec..4f8d55d3ba79c73e2f35edbc245908b3df663a24 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
+++ b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
@@ -64,12 +64,12 @@
        leds {
                compatible = "gpio-leds";
 
-               tx {
+               led-0 {
                        label = "pcduino3:green:tx";
                        gpios = <&pio 7 15 GPIO_ACTIVE_LOW>;
                };
 
-               rx {
+               led-1 {
                        label = "pcduino3:green:rx";
                        gpios = <&pio 7 16 GPIO_ACTIVE_LOW>;
                };

diff --git a/arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts b/arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts
index 317763069c0a7aeb30ace8e794355a72792ae870..065cb620aa992431281317c3e9681018a77f153c 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts
+++ b/arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts
@@ -63,7 +63,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&led_pin_d978>;
 
-               home {
+               led {
                        label = "d978:blue:home";
                        gpios = <&r_pio 0 5 GPIO_ACTIVE_HIGH>; /* PL5 */
                };

diff --git a/arch/arm/boot/dts/sun8i-a33-olinuxino.dts b/arch/arm/boot/dts/sun8i-a33-olinuxino.dts
index a1953b2872d03363578781fb11949c24c13e5755..9adf58f866d68a8bd6588b0cdd52fa5f0e405d2e 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a33-olinuxino.dts
+++ b/arch/arm/boot/dts/sun8i-a33-olinuxino.dts
@@ -62,7 +62,7 @@
        leds {
                compatible = "gpio-leds";
 
-               green {
+               led {
                        label = "a33-olinuxino:green:usr";
                        gpios = <&pio 1 7 GPIO_ACTIVE_HIGH>;
                };

diff --git a/arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts b/arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts
index 431f70234d364295d724cdc0e8739516ec75b241..b60016a4429c54ea9c69ac02be7c5b853a442c0b 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts
+++ b/arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts
@@ -74,12 +74,12 @@
        leds {
                compatible = "gpio-leds";
 
-               blue {
+               led-0 {
                        label = "bananapi-m3:blue:usr";
                        gpios = <&axp_gpio 1 GPIO_ACTIVE_HIGH>;
                };
 
-               green {
+               led-1 {
                        label = "bananapi-m3:green:usr";
                        gpios = <&axp_gpio 0 GPIO_ACTIVE_HIGH>;
                };

diff --git a/arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts b/arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts
index d8326a5c681d41c1c29bc615e96ef758c878b157..e26af7cf10e0ce20c94990bb73767ceff09428f2 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts
+++ b/arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts
@@ -74,22 +74,22 @@
        leds {
                compatible = "gpio-leds";
 
-               blue {
+               led-0 {
                        label = "cubietruck-plus:blue:usr";
                        gpios = <&pio 3 25 GPIO_ACTIVE_HIGH>; /* PD25 */
                };
 
-               orange {
+               led-1 {
                        label = "cubietruck-plus:orange:usr";
                        gpios = <&pio 3 26 GPIO_ACTIVE_HIGH>; /* PD26 */
                };
 
-               white {
+               led-2 {
                        label = "cubietruck-plus:white:usr";
                        gpios = <&pio 3 27 GPIO_ACTIVE_HIGH>; /* PD27 */
                };
 
-               green {
+               led-3 {
                        label = "cubietruck-plus:green:usr";
                        gpios = <&pio 4 4 GPIO_ACTIVE_HIGH>; /* PE4 */
                };

diff --git a/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts b/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts
index 45a24441ff182bf2f78d238adbd2f70520404913..62b5280ec093568ddb482718b1b60e06f9e65b61 100644 (file)
--- a/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts
+++ b/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts
@@ -75,13 +75,13 @@
        leds {
                compatible = "gpio-leds";
 
-               blue {
+               led-0 {
                        label = "beelink-x2:blue:pwr";
                        gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PL10 */
                        default-state = "on";
                };
 
-               red {
+               led-1 {
                        label = "beelink-x2:red:standby";
                        gpios = <&pio 0 15 GPIO_ACTIVE_HIGH>; /* PA15 */
                };

diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts
index 6b149271ef13f6dc4e1867aa6fdb962953c45a0c..8e7dfcffe1fbe471a1e694bb1a32d5b52f9f0646 100644 (file)
--- a/arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts
+++ b/arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts
@@ -25,13 +25,13 @@
        leds {
                compatible = "gpio-leds";
 
-               pwr {
+               led-0 {
                        label = "nanopi:red:pwr";
                        gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PL10 */
                        default-state = "on";
                };
 
-               status {
+               led-1 {
                        label = "nanopi:green:status";
                        gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>; /* PA10 */
                };

diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts
index 07867a0d569b0a3b75d19255eab48857dc712124..be49eabbff9417af341a0b5280c93be2393c5ea0 100644 (file)
--- a/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts
+++ b/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts
@@ -61,13 +61,13 @@
        leds {
                compatible = "gpio-leds";
 
-               pwr {
+               led-0 {
                        label = "nanopi:green:pwr";
                        gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PL10 */
                        default-state = "on";
                };
 
-               status {
+               led-1 {
                        label = "nanopi:blue:status";
                        gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>; /* PA10 */
                };

diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi b/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
index 4df29a65316df98a243df2702e8bdb0c2d69f0e9..c7c3e7d8b3c81c8f4b1711d601b1a5869e5ca56e 100644 (file)
--- a/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
+++ b/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
@@ -60,13 +60,13 @@
        leds {
                compatible = "gpio-leds";
 
-               status {
+               led-0 {
                        label = "nanopi:blue:status";
                        gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "heartbeat";
                };
 
-               pwr {
+               led-1 {
                        label = "nanopi:green:pwr";
                        gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>;
                        default-state = "on";

diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-zero-plus2.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-zero-plus2.dts
index 251bbab7d70738ced2043d9fbfc4667c67111198..561ea1d2f861c437db66bea4125dfb4d8ba88ff5 100644 (file)
--- a/arch/arm/boot/dts/sun8i-h3-orangepi-zero-plus2.dts
+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-zero-plus2.dts
@@ -73,13 +73,13 @@
        leds {
                compatible = "gpio-leds";
 
-               pwr {
+               led-0 {
                        label = "orangepi:green:pwr";
                        gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>;
                        default-state = "on";
                };
 
-               status {
+               led-1 {
                        label = "orangepi:red:status";
                        gpios = <&pio 0 17 GPIO_ACTIVE_HIGH>;
                };

diff --git a/arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts b/arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts
index e1c75f7fa3caaa9a1d50d2eee5e9469125e7317f..015ba66fd277d8204e3f5ecb972b4cb2cd57ca37 100644 (file)
--- a/arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts
+++ b/arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts
@@ -64,17 +64,17 @@
        leds {
                compatible = "gpio-leds";
 
-               blue {
+               led-0 {
                        label = "bpi-m2m:blue:usr";
                        gpios = <&pio 2 7 GPIO_ACTIVE_LOW>;
                };
 
-               green {
+               led-1 {
                        label = "bpi-m2m:green:usr";
                        gpios = <&r_pio 0 2 GPIO_ACTIVE_LOW>;
                };
 
-               red {
+               led-2 {
                        label = "bpi-m2m:red:power";
                        gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>;
                        default-state = "on";

diff --git a/arch/arm/boot/dts/sun8i-r16-parrot.dts b/arch/arm/boot/dts/sun8i-r16-parrot.dts
index 4f48eec6b2efe617f28b6d9ef0f73da2a39b15f0..09a6a3b2cccc0fb7fedb1e87f53d0742b9835c6f 100644 (file)
--- a/arch/arm/boot/dts/sun8i-r16-parrot.dts
+++ b/arch/arm/boot/dts/sun8i-r16-parrot.dts
@@ -64,14 +64,14 @@
        leds {
                compatible = "gpio-leds";
 
-               led1 {
+               led-1 {
                        label = "parrot:led1:usr";
-                       gpio = <&pio 4 17 GPIO_ACTIVE_HIGH>; /* PE17 */
+                       gpios = <&pio 4 17 GPIO_ACTIVE_HIGH>; /* PE17 */
                };
 
-               led2 {
+               led-2 {
                        label = "parrot:led2:usr";
-                       gpio = <&pio 4 16 GPIO_ACTIVE_HIGH>; /* PE16 */
+                       gpios = <&pio 4 16 GPIO_ACTIVE_HIGH>; /* PE16 */
                };
        };
 

diff --git a/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts b/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts
index 484b93df20cb6958c1ad60e02014af7896cf4b2b..1fe251ea94bc058c972627ae55e57917cc16646e 100644 (file)
--- a/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts
+++ b/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts
@@ -63,12 +63,12 @@
        leds {
                compatible = "gpio-leds";
 
-               green {
+               led-0 {
                        label = "cubieboard4:green:usr";
                        gpios = <&pio 7 17 GPIO_ACTIVE_HIGH>; /* PH17 */
                };
 
-               red {
+               led-1 {
                        label = "cubieboard4:red:usr";
                        gpios = <&pio 7 6 GPIO_ACTIVE_HIGH>; /* PH6 */
                };

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
index e5e840b9fbb4392eddffda45e2bdb6b9fb857802..f7fe9fa50cb39ec1a1018c74e4d46d0f6dc3c669 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
@@ -36,18 +36,18 @@
        leds {
                compatible = "gpio-leds";
 
-               pwr-led {
+               led-0 {
                        label = "bananapi-m64:red:pwr";
                        gpios = <&pio 3 24 GPIO_ACTIVE_HIGH>; /* PD24 */
                        default-state = "on";
                };
 
-               green {
+               led-1 {
                        label = "bananapi-m64:green:user";
                        gpios = <&pio 4 14 GPIO_ACTIVE_HIGH>; /* PE14 */
                };
 
-               blue {
+               led-2 {
                        label = "bananapi-m64:blue:user";
                        gpios = <&pio 4 15 GPIO_ACTIVE_HIGH>; /* PE15 */
                };

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts
index e58db8a6cab6969e344d92f9424cea236126ea3e..09b3c7fb82c00917d0040e769f2536dcdfe3fe0f 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts
@@ -35,7 +35,7 @@
        leds {
                compatible = "gpio-leds";
 
-               blue {
+               led {
                        label = "nanopi-a64:blue:status";
                        gpios = <&pio 3 24 GPIO_ACTIVE_LOW>; /* PD24 */
                };

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
index 7f37f9fea0ab2c1086c3105d7e94c46d80f51147..bcf64998a82984e318d858c958290ca7e3d2de7d 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
@@ -31,19 +31,19 @@
        leds {
                compatible = "gpio-leds";
 
-               blue {
+               led-0 {
                        function = LED_FUNCTION_INDICATOR;
                        color = <LED_COLOR_ID_BLUE>;
                        gpios = <&pio 3 20 GPIO_ACTIVE_HIGH>; /* PD20 */
                };
 
-               green {
+               led-1 {
                        function = LED_FUNCTION_INDICATOR;
                        color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pio 3 18 GPIO_ACTIVE_HIGH>; /* PD18 */
                };
 
-               red {
+               led-2 {
                        function = LED_FUNCTION_INDICATOR;
                        color = <LED_COLOR_ID_RED>;
                        gpios = <&pio 3 19 GPIO_ACTIVE_HIGH>; /* PD19 */

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts
index a1864a89fb897ce7081c09966a0aa6c68884c4a4..f0a16f355e270619b8afb14d1b45f23b3e166a5e 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts
@@ -52,12 +52,12 @@
        leds {
                compatible = "gpio-leds";
 
-               capslock {
+               led-0 {
                        label = "teres-i:green:capslock";
                        gpios = <&pio 2 7 GPIO_ACTIVE_HIGH>; /* PC7 */
                };
 
-               numlock {
+               led-1 {
                        label = "teres-i:green:numlock";
                        gpios = <&pio 2 4 GPIO_ACTIVE_HIGH>; /* PC4 */
                };

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts
index 9d93fe15368954c9f359bc959461576be07af2ea..4c3921ac236cca2cacee1b6bfbddc3ee3827351f 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts
@@ -25,13 +25,13 @@
        leds {
                compatible = "gpio-leds";
 
-               pwr {
+               led-0 {
                        label = "nanopi:green:pwr";
                        gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>;
                        default-state = "on";
                };
 
-               status {
+               led-1 {
                        label = "nanopi:red:status";
                        gpios = <&pio 0 20 GPIO_ACTIVE_HIGH>;
                };

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts
index b059e20813bdff18070601e661efcaa1029ebe1f..02f8e72f0cad1db1e5490ee559cd682b5e8250a5 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts
@@ -22,13 +22,13 @@
        leds {
                compatible = "gpio-leds";
 
-               pwr {
+               led-0 {
                        label = "nanopi:green:pwr";
                        gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>;
                        default-state = "on";
                };
 
-               status {
+               led-1 {
                        label = "nanopi:blue:status";
                        gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>;
                };

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts
index 8bf2db9dcbda0b59c6a960277c9380d32d170fc5..1010c1b22d2e6504ef4f0b214f5a84eb906d9e07 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts
@@ -42,13 +42,13 @@
        leds {
                compatible = "gpio-leds";
 
-               pwr {
+               led-0 {
                        label = "orangepi:green:pwr";
                        gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>;
                        default-state = "on";
                };
 
-               status {
+               led-1 {
                        label = "orangepi:red:status";
                        gpios = <&pio 0 20 GPIO_ACTIVE_HIGH>;
                };

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts
index 33ab44072e6d709586d79f270c751c2281cf95d1..74e0444af19bf537e195b7d85bedfdaeca43173c 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts
@@ -36,13 +36,13 @@
        leds {
                compatible = "gpio-leds";
 
-               pwr {
+               led-0 {
                        label = "orangepi:green:pwr";
                        gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>;
                        default-state = "on";
                };
 
-               status {
+               led-1 {
                        label = "orangepi:red:status";
                        gpios = <&pio 0 20 GPIO_ACTIVE_HIGH>;
                };

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus.dts
index ef5ca6444220336398588735482ca1b2360fadc6..d13980ed7a79a41c2c9024f7b2d0fe3ba082fbc9 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus.dts
@@ -33,13 +33,13 @@
        leds {
                compatible = "gpio-leds";
 
-               pwr {
+               led-0 {
                        label = "orangepi:green:pwr";
                        gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PA10 */
                        default-state = "on";
                };
 
-               status {
+               led-1 {
                        label = "orangepi:red:status";
                        gpios = <&pio 0 17 GPIO_ACTIVE_HIGH>; /* PA17 */
                };

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
index de19e68eb84e097b3d89ee696474a819cfce4f5b..22530ace12d5a0c9f505f1a7c66d79e794b2c432 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
@@ -33,13 +33,13 @@
        leds {
                compatible = "gpio-leds";
 
-               pwr {
+               led-0 {
                        label = "orangepi:green:pwr";
                        gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>;
                        default-state = "on";
                };
 
-               status {
+               led-1 {
                        label = "orangepi:red:status";
                        gpios = <&pio 0 17 GPIO_ACTIVE_HIGH>;
                };

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
index 7c9dbde645b52686b327572dc7c7d9fb1c51c535..4f4755152fcea822da8318f2926e0ab54de95d48 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
@@ -43,7 +43,7 @@
        leds {
                compatible = "gpio-leds";
 
-               power {
+               led {
                        label = "beelink:white:power";
                        gpios = <&r_pio 0 4 GPIO_ACTIVE_HIGH>; /* PL4 */
                        default-state = "on";

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
index 15c9dd8c447955f9bf0f2e24b8eaeaf316da62d7..7e83f6146f8a589f06fad2d1f5ec215a78217a8a 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
@@ -43,13 +43,13 @@
        leds {
                compatible = "gpio-leds";
 
-               power {
+               led-0 {
                        label = "orangepi:red:power";
                        gpios = <&r_pio 0 4 GPIO_ACTIVE_HIGH>; /* PL4 */
                        default-state = "on";
                };
 
-               status {
+               led-1 {
                        label = "orangepi:green:status";
                        gpios = <&r_pio 0 7 GPIO_ACTIVE_HIGH>; /* PL7 */
                };

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi
index ebc120a9232f64fc8b43d6a24df6728259b983a1..da0875bd38d40e2e5419bf5e8b0c577cc45714b2 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi
@@ -42,13 +42,13 @@
        leds {
                compatible = "gpio-leds";
 
-               power {
+               led-0 {
                        label = "orangepi:red:power";
                        gpios = <&r_pio 0 4 GPIO_ACTIVE_HIGH>; /* PL4 */
                        default-state = "on";
                };
 
-               status {
+               led-1 {
                        label = "orangepi:green:status";
                        gpios = <&r_pio 0 7 GPIO_ACTIVE_HIGH>; /* PL7 */
                };

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
index 15ceba027a73205509fce8e37b150a5769bf832a..b868ad17af8fdad6563035996b82fb5da7bf7dcd 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
@@ -44,17 +44,17 @@
        leds {
                compatible = "gpio-leds";
 
-               heartbeat {
+               led-0 {
                        label = "pine-h64:green:heartbeat";
                        gpios = <&r_pio 0 4 GPIO_ACTIVE_HIGH>; /* PL4 */
                };
 
-               link {
+               led-1 {
                        label = "pine-h64:white:link";
                        gpios = <&r_pio 0 3 GPIO_ACTIVE_HIGH>; /* PL3 */
                };
 
-               status {
+               led-2 {
                        label = "pine-h64:blue:status";
                        gpios = <&r_pio 0 7 GPIO_ACTIVE_HIGH>; /* PL7 */
                };