Commit f0344b33 authored by Johan Jonker's avatar Johan Jonker Committed by Heiko Stuebner
Browse files

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: default avatarJohan Jonker <jbx6244@gmail.com>
Link: https://lore.kernel.org/r/20200428144933.10953-1-jbx6244@gmail.com


Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent 8f3d9f35

arch/arm/boot/dts/rk3036-kylin.dts

+1 −1
Original line number Diff line number Diff line
@@ -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";

arch/arm/boot/dts/rk3066a-mk808.dts

+1 −1
Original line number Diff line number Diff line
@@ -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";

arch/arm/boot/dts/rk3188-radxarock.dts

+3 −3
Original line number Diff line number Diff line
@@ -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";

arch/arm/boot/dts/rk3229-xms6.dts

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
	power-led {

		compatible = "gpio-leds";



		blue {

		blue_led: led-0 {

			gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>;

			default-state = "on";

		};

arch/arm/boot/dts/rk3288-firefly-reload.dts

+6 −6
Original line number Diff line number Diff line
@@ -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>;

		};

	};