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: 2e04c25b1320 ("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>

diff --git a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
index 84f4b4a44644c4fb3e301aab948ca1e12d48b644..079101cddd65fa102cb1e40c4bbfa2433ce0dbbf 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
@@ -5,6 +5,8 @@
  */
 
 /dts-v1/;
+
+#include <dt-bindings/leds/common.h>
 #include "rk3308.dtsi"
 
 / {
@@ -24,17 +26,21 @@
        leds {
                compatible = "gpio-leds";
                pinctrl-names = "default";
-               pinctrl-0 = <&green_led_gio>, <&heartbeat_led_gpio>;
+               pinctrl-0 = <&green_led>, <&heartbeat_led>;
 
                green-led {
+                       color = <LED_COLOR_ID_GREEN>;
                        default-state = "on";
+                       function = LED_FUNCTION_POWER;
                        gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;
                        label = "rockpis:green:power";
                        linux,default-trigger = "default-on";
                };
 
                blue-led {
+                       color = <LED_COLOR_ID_BLUE>;
                        default-state = "on";
+                       function = LED_FUNCTION_HEARTBEAT;
                        gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;
                        label = "rockpis:blue:user";
                        linux,default-trigger = "heartbeat";
@@ -216,11 +222,11 @@
        pinctrl-0 = <&rtc_32k>;
 
        leds {
-               green_led_gio: green-led-gpio {
+               green_led: green-led {
                        rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
                };
 
-               heartbeat_led_gpio: heartbeat-led-gpio {
+               heartbeat_led: heartbeat-led {
                        rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
                };
        };