arm64: dts: meson: fix leds subnodes name

Fix the leds subnode names to match (^led-[0-9a-f]$|led)

It fixes:
meson-g12b-a311d-khadas-vim3.dt.yaml: leds: 'red', 'white' do not match any of the regexes: '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
meson-g12b-s922x-khadas-vim3.dt.yaml: leds: 'red', 'white' do not match any of the regexes: '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
meson-g12b-odroid-n2.dt.yaml: leds: 'blue' does not match any of the regexes: '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
meson-gxbb-nanopi-k2.dt.yaml: leds: 'stat' does not match any of the regexes: '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
meson-gxbb-nexbox-a95x.dt.yaml: leds: 'blue' does not match any of the regexes: '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
meson-gxbb-odroidc2.dt.yaml: leds: 'blue' does not match any of the regexes: '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
meson-gxbb-vega-s95-pro.dt.yaml: leds: 'blue' does not match any of the regexes: '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
meson-gxbb-vega-s95-meta.dt.yaml: leds: 'blue' does not match any of the regexes: '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
meson-gxbb-vega-s95-telos.dt.yaml: leds: 'blue' does not match any of the regexes: '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
meson-gxbb-wetek-hub.dt.yaml: leds: 'system' does not match any of the regexes: '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
meson-gxbb-wetek-play2.dt.yaml: leds: 'ethernet', 'system', 'wifi' do not match any of the regexes: '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
meson-gxl-s905x-libretech-cc.dt.yaml: leds: 'blue', 'system' do not match any of the regexes: '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
meson-gxl-s905d-libretech-pc.dt.yaml: leds: 'blue', 'green' do not match any of the regexes: '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
meson-gxm-rbox-pro.dt.yaml: leds: 'blue', 'red' do not match any of the regexes: '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
meson-gxm-s912-libretech-pc.dt.yaml: leds: 'blue', 'green' do not match any of the regexes: '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
meson-sm1-sei610.dt.yaml: leds: 'bluetooth' does not match any of the regexes: '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
meson-sm1-khadas-vim3l.dt.yaml: leds: 'red', 'white' do not match any of the regexes: '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
Link: https://lore.kernel.org/r/20200326165958.19274-6-narmstrong@baylibre.com

diff --git a/arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi
index ed9f89ee86a82760763c5247bd2e12090fad7ce7..c47d96067203f48fb0a1406e85bb753c6842d0d5 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi
@@ -96,14 +96,14 @@
        leds {
                compatible = "gpio-leds";
 
-               green {
+               led-green {
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_DISK_ACTIVITY;
                        gpios = <&gpio_ao GPIOAO_9 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "disk-activity";
                };
 
-               blue {
+               led-blue {
                        color = <LED_COLOR_ID_BLUE>;
                        function = LED_FUNCTION_STATUS;
                        gpios = <&gpio GPIODV_28 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
index d6ca684e0e616bc1d2a63df5fe5505f9fab46c2c..7be3e354093bfad3f8ac298889379ce32d072810 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
@@ -29,7 +29,7 @@
        leds {
                compatible = "gpio-leds";
 
-               stat {
+               led-stat {
                        label = "nanopi-k2:blue:stat";
                        gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_HIGH>;
                        default-state = "on";

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts
index 65ec7dea828c1e417c742db28e0c3b1aa63250cd..67d901ed2fa3a5dbfabbad19668cca65fbca9d48 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts
@@ -31,7 +31,7 @@
 
        leds {
                compatible = "gpio-leds";
-               blue {
+               led-blue {
                        label = "a95x:system-status";
                        gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "heartbeat";

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
index b46ef985bb4449aaea2a63aa835cf81d7965e5f5..70fcfb7b0683d43a9397301eb4403a155066b826 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
@@ -49,7 +49,7 @@
 
        leds {
                compatible = "gpio-leds";
-               blue {
+               led-blue {
                        label = "c2:blue:alive";
                        gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "heartbeat";

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
index 45cb83625951a97f6de3b4b9d050dd74893b7bf3..222ee8069cfaa4c024b55effa25b940a7284f006 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
@@ -20,7 +20,7 @@
        leds {
                compatible = "gpio-leds";
 
-               blue {
+               led-blue {
                        label = "vega-s95:blue:on";
                        gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_HIGH>;
                        default-state = "on";

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts
index 1d32d1f6d03274181d737be2227703b3953b6381..2ab8a3d10079188240a19934ca907a69765a8641 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts
@@ -14,13 +14,13 @@
        model = "WeTek Play 2";
 
        leds {
-               wifi {
+               led-wifi {
                        label = "wetek-play:wifi-status";
                        gpios = <&gpio GPIODV_26 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
 
-               ethernet {
+               led-ethernet {
                        label = "wetek-play:ethernet-status";
                        gpios = <&gpio GPIODV_27 GPIO_ACTIVE_HIGH>;
                        default-state = "off";

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
index dee51cf952237d9adf1cfe28753aeba836ccc129..d6133af09d64362c88aee8c84d8403f9f8e45816 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
@@ -25,7 +25,7 @@
        leds {
                compatible = "gpio-leds";
 
-               system {
+               led-system {
                        label = "wetek-play:system-status";
                        gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_HIGH>;
                        default-state = "on";

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
index e493831a80f067d7c8122634bf7f6ada894c4f0b..297901b20aa0088f260a72bffda9901cccdefbf3 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
@@ -54,14 +54,14 @@
        leds {
                compatible = "gpio-leds";
 
-               system {
+               led-system {
                        label = "librecomputer:system-status";
                        gpios = <&gpio GPIODV_24 GPIO_ACTIVE_HIGH>;
                        default-state = "on";
                        panic-indicator;
                };
 
-               blue {
+               led-blue {
                        label = "librecomputer:blue";
                        gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "heartbeat";

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts
index 420a88e9a1950096beae7663f7da74c798a00503..c89c9f846fb10fdf1d7507aab6e5ca0599c189aa 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts
@@ -36,13 +36,13 @@
        leds {
                compatible = "gpio-leds";
 
-               blue {
+               led-blue {
                        label = "rbox-pro:blue:on";
                        gpios = <&gpio_ao GPIOAO_9 GPIO_ACTIVE_HIGH>;
                        default-state = "on";
                };
 
-               red {
+               led-red {
                        label = "rbox-pro:red:standby";
                        gpios = <&gpio GPIODV_28 GPIO_ACTIVE_HIGH>;
                        default-state = "off";

diff --git a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi
index 094ecf2222bbfe7ef96b7fca81d3a4e3ba4cf52b..1ef1e3672b9670aa2a93bebbcf1c15347d4e3325 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi
@@ -39,13 +39,13 @@
        leds {
                compatible = "gpio-leds";
 
-               white {
+               led-white {
                        label = "vim3:white:sys";
                        gpios = <&gpio_ao GPIOAO_4 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "heartbeat";
                };
 
-               red {
+               led-red {
                        label = "vim3:red";
                        gpios = <&gpio_expander 5 GPIO_ACTIVE_LOW>;
                };

diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts
index dfb2438851c0cd94440106d37d789fd4ccf88880..5ab139a34c0186dd522b063000ef7f90e315a9c5 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts
@@ -104,7 +104,7 @@
        leds {
                compatible = "gpio-leds";
 
-               bluetooth {
+               led-bluetooth {
                        label = "sei610:blue:bt";
                        gpios = <&gpio GPIOC_7 (GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN)>;
                        default-state = "off";