ARM: dts: rockchip: rename and label gpio-led subnodes

Current dts files with 'gpio-led' nodes were manually verified.
In order to automate this process leds-gpio.txt
has been converted to yaml. With this conversion a check
for pattern properties was added. A test with the command
below gives a screen full of warnings like:

arch/arm/boot/dts/rk3188-radxarock.dt.yaml: gpio-leds:
'blue', 'green', 'sleep'
do not match any of the regexes:
'(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'

Fix these errors with help of the following rules:

1: Add nodename in the preferred form.

2: Always add a label that ends with '_led' to prevent conflicts
   with other labels such as 'power' and 'mmc'

3: If leds need pinctrl add a label that ends with '_led_pin'
   also to prevent conflicts with other labels.

patternProperties:
  # The first form is preferred, but fall back to just 'led'
  # anywhere in the node name to at least catch some child nodes.
  "(^led-[0-9a-f]$|led)":

make ARCH=arm dtbs_check
DT_SCHEMA_FILES=Documentation/devicetree/bindings/leds/
leds-gpio.yaml

Signed-off-by: Johan Jonker <jbx6244@gmail.com>
Link: https://lore.kernel.org/r/20200428144933.10953-1-jbx6244@gmail.com
Signed-off-by: Heiko Stuebner <heiko@sntech.de>

diff --git a/arch/arm/boot/dts/rk3036-kylin.dts b/arch/arm/boot/dts/rk3036-kylin.dts
index 2ff9f152d29b8c1ea887772e72bea7d53b61cb01..7154b827ea2f073e765ef387404ac2d2bc463543 100644 (file)
--- a/arch/arm/boot/dts/rk3036-kylin.dts
+++ b/arch/arm/boot/dts/rk3036-kylin.dts
@@ -16,7 +16,7 @@
        leds: gpio-leds {
                compatible = "gpio-leds";
 
-               work {
+               work_led: led-0 {
                        gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>;
                        label = "kylin:red:led";
                        pinctrl-names = "default";

diff --git a/arch/arm/boot/dts/rk3066a-mk808.dts b/arch/arm/boot/dts/rk3066a-mk808.dts
index 365eff621113f20e9fe2f3610913b022ace06f61..eed9e60cffa231ec7aec8cccd24eb8e4f0228d34 100644 (file)
--- a/arch/arm/boot/dts/rk3066a-mk808.dts
+++ b/arch/arm/boot/dts/rk3066a-mk808.dts
@@ -22,7 +22,7 @@
        gpio-leds {
                compatible = "gpio-leds";
 
-               blue {
+               blue_led: led-0 {
                        label = "mk808:blue:power";
                        gpios = <&gpio0 RK_PA3 GPIO_ACTIVE_HIGH>;
                        default-state = "off";

diff --git a/arch/arm/boot/dts/rk3188-radxarock.dts b/arch/arm/boot/dts/rk3188-radxarock.dts
index c9a7f54099608237a9bd62d311bde4e6bf2571b5..b0fef82c0a71b73402611a4939d5c355ec1efb0d 100644 (file)
--- a/arch/arm/boot/dts/rk3188-radxarock.dts
+++ b/arch/arm/boot/dts/rk3188-radxarock.dts
@@ -33,19 +33,19 @@
        gpio-leds {
                compatible = "gpio-leds";
 
-               green {
+               green_led: led-0 {
                        label = "rock:green:user1";
                        gpios = <&gpio0 RK_PB4 GPIO_ACTIVE_LOW>;
                        default-state = "off";
                };
 
-               blue {
+               blue_led: led-1 {
                        label = "rock:blue:user2";
                        gpios = <&gpio0 RK_PB6 GPIO_ACTIVE_LOW>;
                        default-state = "off";
                };
 
-               sleep {
+               sleep_led: led-2 {
                        label = "rock:red:power";
                        gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;
                        default-state = "off";

diff --git a/arch/arm/boot/dts/rk3229-xms6.dts b/arch/arm/boot/dts/rk3229-xms6.dts
index 679fc2b00e5ac37064283121e2438b3dca0afcdb..9252a735c45033244870a4873c5e3918505d5a64 100644 (file)
--- a/arch/arm/boot/dts/rk3229-xms6.dts
+++ b/arch/arm/boot/dts/rk3229-xms6.dts
@@ -33,7 +33,7 @@
        power-led {
                compatible = "gpio-leds";
 
-               blue {
+               blue_led: led-0 {
                        gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>;
                        default-state = "on";
                };

diff --git a/arch/arm/boot/dts/rk3288-firefly-reload.dts b/arch/arm/boot/dts/rk3288-firefly-reload.dts
index 8c38bda21a7c940aa476ba802dda776803cf466a..9a4a9749c4055a96e4ed982e32de34e512895602 100644 (file)
--- a/arch/arm/boot/dts/rk3288-firefly-reload.dts
+++ b/arch/arm/boot/dts/rk3288-firefly-reload.dts
@@ -45,20 +45,20 @@
        leds {
                compatible = "gpio-leds";
 
-               power {
+               power_led: led-0 {
                        gpios = <&gpio8 RK_PA2 GPIO_ACTIVE_LOW>;
                        label = "firefly:blue:power";
                        pinctrl-names = "default";
-                       pinctrl-0 = <&power_led>;
+                       pinctrl-0 = <&power_led_pin>;
                        panic-indicator;
                };
 
-               work {
+               work_led: led-1 {
                        gpios = <&gpio8 RK_PA1 GPIO_ACTIVE_LOW>;
                        label = "firefly:blue:user";
                        linux,default-trigger = "rc-feedback";
                        pinctrl-names = "default";
-                       pinctrl-0 = <&work_led>;
+                       pinctrl-0 = <&work_led_pin>;
                };
        };
 
@@ -334,11 +334,11 @@
        };
 
        leds {
-               power_led: power-led {
+               power_led_pin: power-led-pin {
                        rockchip,pins = <8 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
                };
 
-               work_led: work-led {
+               work_led_pin: work-led-pin {
                        rockchip,pins = <8 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
                };
        };

diff --git a/arch/arm/boot/dts/rk3288-firefly.dtsi b/arch/arm/boot/dts/rk3288-firefly.dtsi
index 5e0a19004e46ef68aff167d380ca7730414d32f1..e5c4fd4ea67ee1d66c43b6494e48a652acf46549 100644 (file)
--- a/arch/arm/boot/dts/rk3288-firefly.dtsi
+++ b/arch/arm/boot/dts/rk3288-firefly.dtsi
@@ -62,20 +62,20 @@
        leds {
                compatible = "gpio-leds";
 
-               work {
+               work_led: led-0 {
                        gpios = <&gpio8 RK_PA1 GPIO_ACTIVE_LOW>;
                        label = "firefly:blue:user";
                        linux,default-trigger = "rc-feedback";
                        pinctrl-names = "default";
-                       pinctrl-0 = <&work_led>;
+                       pinctrl-0 = <&work_led_pin>;
                };
 
-               power {
+               power_led: led-1 {
                        gpios = <&gpio8 RK_PA2 GPIO_ACTIVE_LOW>;
                        label = "firefly:green:power";
                        linux,default-trigger = "default-on";
                        pinctrl-names = "default";
-                       pinctrl-0 = <&power_led>;
+                       pinctrl-0 = <&power_led_pin>;
                };
        };
 
@@ -429,11 +429,11 @@
        };
 
        leds {
-               power_led: power-led {
+               power_led_pin: power-led-pin {
                        rockchip,pins = <8 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
                };
 
-               work_led: work-led {
+               work_led_pin: work-led-pin {
                        rockchip,pins = <8 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
                };
        };

diff --git a/arch/arm/boot/dts/rk3288-miqi.dts b/arch/arm/boot/dts/rk3288-miqi.dts
index c41d012c88503d4663e8d5ce2c22e5eca844d819..213c9eb84f7636510741c53fe5abd194bcd21e46 100644 (file)
--- a/arch/arm/boot/dts/rk3288-miqi.dts
+++ b/arch/arm/boot/dts/rk3288-miqi.dts
@@ -30,7 +30,7 @@
        leds {
                compatible = "gpio-leds";
 
-               work {
+               work_led: led-0 {
                        gpios = <&gpio7 RK_PA2 GPIO_ACTIVE_HIGH>;
                        label = "miqi:green:user";
                        linux,default-trigger = "timer";

diff --git a/arch/arm/boot/dts/rk3288-phycore-som.dtsi b/arch/arm/boot/dts/rk3288-phycore-som.dtsi
index 77a47b9b756d6915013000e2654e46cb91570b64..e43887c9635ff659ddb24a825ae7fbb7f7c4b881 100644 (file)
--- a/arch/arm/boot/dts/rk3288-phycore-som.dtsi
+++ b/arch/arm/boot/dts/rk3288-phycore-som.dtsi
@@ -36,9 +36,9 @@
        leds: user-leds {
                compatible = "gpio-leds";
                pinctrl-names = "default";
-               pinctrl-0 = <&user_led>;
+               pinctrl-0 = <&user_led_pin>;
 
-               user {
+               user_led: led-0 {
                        label = "green_led";
                        gpios = <&gpio7 2 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "heartbeat";
@@ -372,7 +372,7 @@
        };
 
        leds {
-               user_led: user-led {
+               user_led_pin: user-led-pin {
                        rockchip,pins = <7 RK_PA2 RK_FUNC_GPIO &pcfg_output_high>;
                };
        };

diff --git a/arch/arm/boot/dts/rk3288-rock2-square.dts b/arch/arm/boot/dts/rk3288-rock2-square.dts
index cdcdc921ee09b7469f5ef64e814d7267e8c55507..3cca4d0f9b0918c35d48d4b5bd4e3191c0862e10 100644 (file)
--- a/arch/arm/boot/dts/rk3288-rock2-square.dts
+++ b/arch/arm/boot/dts/rk3288-rock2-square.dts
@@ -41,13 +41,13 @@
        gpio-leds {
                compatible = "gpio-leds";
 
-               heartbeat {
+               heartbeat_led: led-0 {
                        gpios = <&gpio7 RK_PB7 GPIO_ACTIVE_LOW>;
                        label = "rock2:green:state1";
                        linux,default-trigger = "heartbeat";
                };
 
-               mmc {
+               mmc_led: led-1 {
                        gpios = <&gpio0 RK_PB3 GPIO_ACTIVE_LOW>;
                        label = "rock2:blue:state2";
                        linux,default-trigger = "mmc0";

diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi
index acfaa12ec239e67c6f9aa264d367b7a65847aac7..90e9be443fe6de8ba8748c8fe4aaae27d9ba9d84 100644 (file)
--- a/arch/arm/boot/dts/rk3288-tinker.dtsi
+++ b/arch/arm/boot/dts/rk3288-tinker.dtsi
@@ -46,17 +46,17 @@
        gpio-leds {
                compatible = "gpio-leds";
 
-               act-led {
+               act_led: led-0 {
                        gpios = <&gpio1 RK_PD0 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "mmc0";
                };
 
-               heartbeat-led {
+               heartbeat_led: led-1 {
                        gpios = <&gpio1 RK_PD1 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "heartbeat";
                };
 
-               pwr-led {
+               pwr_led: led-2 {
                        gpios = <&gpio0 RK_PA3 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "default-on";
                };