shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 02:50:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

arm64: dts: rockchip: Rename LED related pinctrl nodes on rk3308-rock-pi-s

Browse Source 
[ Upstream commit d2a52f678883fe4bc00bca89366b1ba504750abf ]

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: 2e04c25b13 ("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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Jonas Karlman
2024-05-21 21:10:09 +00:00
committed by Greg Kroah-Hartman
parent b619f741b6
commit bccc0c847f
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,6 +5,8 @@
*/ */
/dts-v1/; /dts-v1/;
#include <dt-bindings/leds/common.h>
#include "rk3308.dtsi" #include "rk3308.dtsi"
/ { / {
@@ -24,17 +26,21 @@
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&green_led_gio>, <&heartbeat_led_gpio>; pinctrl-0 = <&green_led>, <&heartbeat_led>;
green-led { green-led {
color = <LED_COLOR_ID_GREEN>;
default-state = "on"; default-state = "on";
function = LED_FUNCTION_POWER;
gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;
label = "rockpis:green:power"; label = "rockpis:green:power";
linux,default-trigger = "default-on"; linux,default-trigger = "default-on";
}; };
blue-led { blue-led {
color = <LED_COLOR_ID_BLUE>;
default-state = "on"; default-state = "on";
function = LED_FUNCTION_HEARTBEAT;
gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;
label = "rockpis:blue:user"; label = "rockpis:blue:user";
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
@@ -155,11 +161,11 @@
pinctrl-0 = <&rtc_32k>; pinctrl-0 = <&rtc_32k>;
leds { leds {
green_led_gio: green-led-gpio { green_led: green-led {
rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>; 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>; rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };