Skip to content

Commit d2a52f6

Browse files
Kwiboommind
authored andcommitted
arm64: dts: rockchip: Rename LED related pinctrl nodes on rk3308-rock-pi-s
The nodename, <name>-gpio, of referenced pinctrl nodes for the two LEDs on the ROCK Pi S cause DT schema validation error: leds: green-led-gpio: {'rockchip,pins': [[0, 6, 0, 90]], 'phandle': [[98]]} is not of type 'array' from schema $id: http://devicetree.org/schemas/gpio/gpio-consumer.yaml# leds: heartbeat-led-gpio: {'rockchip,pins': [[0, 5, 0, 90]], 'phandle': [[99]]} is not of type 'array' from schema $id: http://devicetree.org/schemas/gpio/gpio-consumer.yaml# Rename the pinctrl nodes and symbols to pass DT schema validation, also extend LED nodes with information about color and function. Fixes: 2e04c25 ("arm64: dts: rockchip: add ROCK Pi S DTS support") Signed-off-by: Jonas Karlman <jonas@kwiboo.se> Link: https://lore.kernel.org/r/20240521211029.1236094-7-jonas@kwiboo.se Signed-off-by: Heiko Stuebner <heiko@sntech.de>
1 parent 1fb98c8 commit d2a52f6

1 file changed

Lines changed: 9 additions & 3 deletions

File tree

arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
*/
66

77
/dts-v1/;
8+
9+
#include <dt-bindings/leds/common.h>
810
#include "rk3308.dtsi"
911

1012
/ {
@@ -24,17 +26,21 @@
2426
leds {
2527
compatible = "gpio-leds";
2628
pinctrl-names = "default";
27-
pinctrl-0 = <&green_led_gio>, <&heartbeat_led_gpio>;
29+
pinctrl-0 = <&green_led>, <&heartbeat_led>;
2830

2931
green-led {
32+
color = <LED_COLOR_ID_GREEN>;
3033
default-state = "on";
34+
function = LED_FUNCTION_POWER;
3135
gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;
3236
label = "rockpis:green:power";
3337
linux,default-trigger = "default-on";
3438
};
3539

3640
blue-led {
41+
color = <LED_COLOR_ID_BLUE>;
3742
default-state = "on";
43+
function = LED_FUNCTION_HEARTBEAT;
3844
gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;
3945
label = "rockpis:blue:user";
4046
linux,default-trigger = "heartbeat";
@@ -216,11 +222,11 @@
216222
pinctrl-0 = <&rtc_32k>;
217223

218224
leds {
219-
green_led_gio: green-led-gpio {
225+
green_led: green-led {
220226
rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
221227
};
222228

223-
heartbeat_led_gpio: heartbeat-led-gpio {
229+
heartbeat_led: heartbeat-led {
224230
rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
225231
};
226232
};

0 commit comments

Comments
 (0)