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 af8ab73..20f9ed2 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 6ca02e8..0645d60 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 8a7b4c5..1aeb0bd 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 a843e57..81fdb21 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 845f768..ad0e25a 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 83287b6..1ac8237 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 64d50fc..04b0e6d 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 8af0eae..667bc2d 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 6e90ccb..d021940 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 d6bb82c..5832bb3 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 b2a49a2..964360f 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 1f74ba1..ef8baa9 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 ba8d75b..2ce361f 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 5df398d..bfe1075 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 3910122..fadeae3 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 e9ef97c..3428beb 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 6cc8ccf..744723d 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 a645c8f..aff716b 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 648f247..959ed9c 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 367006f..b4ce60a 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 8945dbb..caa935c 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 0b3d9ae..9d792d7 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 01ccff7..042badd 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 b8203e4..e35e699 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 9109ca0..52160e3 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 358ed5f..b21ddd0 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 946c272..8ff8301 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 17fa890..97518af 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 6bff9e7..f161d52 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 6f9c54b..f05ee32 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 230d62a..54af6c1 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 2adbac8..92938d0 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 9ba6277..8077f17 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 359bd0d..a1b89b2 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 2e328d2..84efa01 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 d75b2e2..5d77f1d 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 bf38c66..e40ecb4 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 cc8271d..4f8d55d 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 3177630..065cb62 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 a1953b2..9adf58f 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 431f702..b60016a 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 d8326a5..e26af7c 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 45a2444..62b5280 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 6b14927..8e7dfcf 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 07867a0..be49eab 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 4df29a6..c7c3e7d 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 251bbab..561ea1d 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 e1c75f7..015ba66 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 4f48eec..09a6a3b 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 484b93d..1fe251e 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 e5e840b..f7fe9fa 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 e58db8a..09b3c7f 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 7f37f9f..bcf6499 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 a1864a8..f0a16f3 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 9d93fe1..4c3921a 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 b059e20..02f8e72 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 8bf2db9..1010c1b 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 33ab440..74e0444 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 ef5ca64..d13980e 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 de19e68..22530ac 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 7c9dbde..4f47551 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 15c9dd8..7e83f61 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 ebc120a..da0875b 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 15ceba0..b868ad1 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 */
                };