[PATCH v1 2/2] arm64: dts: rockchip: rename and label gpio-led subnodes part 3

Johan Jonker
2020-08-13T19:35:08Z

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. In part 3 rename and label
gpio-led subnodes with pinctrl. To make things equal to other
dts files move pinctrl below the compatible property.

Fix 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=arm64 dtbs_check
DT_SCHEMA_FILES=Documentation/devicetree/bindings/leds/
leds-gpio.yaml

Signed-off-by: Johan Jonker <jbx6244@gmail.com>
---
arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts | 10 ++++------
arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 6 +++---
2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts b/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts
index b058ce999..dd6be31f1 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts
@@ -49,20 +49,18 @@

leds: gpio-leds {
compatible = "gpio-leds";
+ pinctrl-names = "default";
+ pinctrl-0 = <&red_led_pin>, <&blue_led_pin>;

red_led: led-0 {
gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>;
label = "orion:red:led";
- pinctrl-names = "default";
- pinctrl-0 = <&led_ctl>;
default-state = "on";
};

blue_led: led-1 {
gpios = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>;
label = "orion:blue:led";
- pinctrl-names = "default";
- pinctrl-0 = <&stby_pwren>;
default-state = "off";
};
};
@@ -256,11 +254,11 @@
};

leds {
- stby_pwren: stby-pwren {
+ blue_led_pin: blue-led-pin {
rockchip,pins = <0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
};

- led_ctl: led-ctl {
+ red_led_pin: red-led-pin {
rockchip,pins = <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
diff --git a/arch/arm64/boot/dts/rockchip/rk3368-r88.dts b/arch/arm64/boot/dts/rockchip/rk3368-r88.dts
index 236ab0f1b..e29c8d172 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368-r88.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368-r88.dts
@@ -42,12 +42,12 @@

leds: gpio-leds {
compatible = "gpio-leds";
+ pinctrl-names = "default";
+ pinctrl-0 = <&work_led_pin>;

work_led: led-0 {
gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>;
label = "r88:green:led";
- pinctrl-names = "default";
- pinctrl-0 = <&led_ctl>;
};
};

@@ -275,7 +275,7 @@
rockchip,pins = <0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
};

- led_ctl: led-ctl {
+ work_led_pin: work-led-pin {
rockchip,pins = <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
--
2.11.0