2022-11-25 15:08:34

by Krzysztof Kozlowski

[permalink] [raw]
Subject: [PATCH] arm64: dts: hisilicon: align LED node names with dtschema

The node names should be generic and DT schema expects certain pattern:

hisilicon/hi3660-hikey960.dtb: leds: wlan_active_led: Unevaluated properties are not allowed ('linux,default-trigger' was unexpected)

Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 12 ++++++------
arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
index 0192a01bf852..3f13a960f34e 100644
--- a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
+++ b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
@@ -85,28 +85,28 @@ key-power {
leds {
compatible = "gpio-leds";

- user_led1 {
+ led-user-1 {
label = "green:user1";
/* gpio_150_user_led1 */
gpios = <&gpio18 6 0>;
linux,default-trigger = "heartbeat";
};

- user_led2 {
+ led-user-2 {
label = "green:user2";
/* gpio_151_user_led2 */
gpios = <&gpio18 7 0>;
linux,default-trigger = "none";
};

- user_led3 {
+ led-user-3 {
label = "green:user3";
/* gpio_189_user_led3 */
gpios = <&gpio23 5 0>;
linux,default-trigger = "mmc0";
};

- user_led4 {
+ led-user-4 {
label = "green:user4";
/* gpio_190_user_led4 */
gpios = <&gpio23 6 0>;
@@ -114,7 +114,7 @@ user_led4 {
linux,default-trigger = "none";
};

- wlan_active_led {
+ led-wlan {
label = "yellow:wlan";
/* gpio_205_wifi_active */
gpios = <&gpio25 5 0>;
@@ -122,7 +122,7 @@ wlan_active_led {
default-state = "off";
};

- bt_active_led {
+ led-bt {
label = "blue:bt";
gpios = <&gpio25 7 0>;
/* gpio_207_user_led1 */
diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
index 629e604aa281..f0672ec65b26 100644
--- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
+++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
@@ -125,39 +125,39 @@ wl1835_pwrseq: wl1835-pwrseq {
leds {
compatible = "gpio-leds";

- user_led1 {
+ led-user-1 {
label = "green:user1";
gpios = <&gpio4 0 0>; /* <&gpio_user_led_1>; */
linux,default-trigger = "heartbeat";
};

- user_led2 {
+ led-user-2 {
label = "green:user2";
gpios = <&gpio4 1 0>; /* <&gpio_user_led_2>; */
linux,default-trigger = "mmc0";
};

- user_led3 {
+ led-user-3 {
label = "green:user3";
gpios = <&gpio4 2 0>; /* <&gpio_user_led_3>; */
linux,default-trigger = "mmc1";
};

- user_led4 {
+ led-user-4 {
label = "green:user4";
gpios = <&gpio4 3 0>; /* <&gpio_user_led_4>; */
panic-indicator;
linux,default-trigger = "none";
};

- wlan_active_led {
+ led-wlan {
label = "yellow:wlan";
gpios = <&gpio3 5 0>; /* <&gpio_wlan_active_led>; */
linux,default-trigger = "phy0tx";
default-state = "off";
};

- bt_active_led {
+ led-bt {
label = "blue:bt";
gpios = <&gpio4 7 0>; /* <&gpio_bt_active_led>; */
linux,default-trigger = "hci0-power";
--
2.34.1


2023-01-13 11:13:16

by Krzysztof Kozlowski

[permalink] [raw]
Subject: Re: [PATCH] arm64: dts: hisilicon: align LED node names with dtschema

On Fri, 25 Nov 2022 15:41:39 +0100, Krzysztof Kozlowski wrote:
> The node names should be generic and DT schema expects certain pattern:
>
> hisilicon/hi3660-hikey960.dtb: leds: wlan_active_led: Unevaluated properties are not allowed ('linux,default-trigger' was unexpected)
>
>

Applied, thanks!

[1/1] arm64: dts: hisilicon: align LED node names with dtschema
https://git.kernel.org/krzk/linux-dt/c/d0931f1d5e9c1655cfa8128edd14e813b4044801

Best regards,
--
Krzysztof Kozlowski <[email protected]>

2023-01-16 01:03:54

by Wei Xu

[permalink] [raw]
Subject: Re: [PATCH] arm64: dts: hisilicon: align LED node names with dtschema

Hi Krzysztof,

On 2023/1/13 18:51, Krzysztof Kozlowski wrote:
> On Fri, 25 Nov 2022 15:41:39 +0100, Krzysztof Kozlowski wrote:
>> The node names should be generic and DT schema expects certain pattern:
>>
>> hisilicon/hi3660-hikey960.dtb: leds: wlan_active_led: Unevaluated properties are not allowed ('linux,default-trigger' was unexpected)
>>
>>
>
> Applied, thanks!
>
> [1/1] arm64: dts: hisilicon: align LED node names with dtschema
> https://git.kernel.org/krzk/linux-dt/c/d0931f1d5e9c1655cfa8128edd14e813b4044801
>
> Best regards,
>

Thanks!

Best Regards,
Wei