Skip to content

Commit d3bf246

Browse files
retro98boyigorpecovnik
authored andcommitted
SMART AM40: drop deprecated label property in gpio leds node
1 parent 7a6e806 commit d3bf246

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

patch/kernel/archive/rockchip64-6.12/dt/rk3399-am40.dts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
#include <dt-bindings/input/linux-event-codes.h>
1010
#include <dt-bindings/pwm/pwm.h>
11+
#include <dt-bindings/leds/common.h>
1112
#include "rk3399.dtsi"
1213

1314
/ {
@@ -43,7 +44,8 @@
4344
pinctrl-0 = <&pwr_led>;
4445

4546
pwr-led {
46-
label = "pwr-led";
47+
function = LED_FUNCTION_POWER;
48+
color = <LED_COLOR_ID_YELLOW>;
4749
gpios = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>;
4850
default-state = "on";
4951
};

patch/kernel/archive/rockchip64-6.15/dt/rk3399-am40.dts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
#include <dt-bindings/input/linux-event-codes.h>
1010
#include <dt-bindings/pwm/pwm.h>
11+
#include <dt-bindings/leds/common.h>
1112
#include "rk3399.dtsi"
1213

1314
/ {
@@ -43,7 +44,8 @@
4344
pinctrl-0 = <&pwr_led>;
4445

4546
pwr-led {
46-
label = "pwr-led";
47+
function = LED_FUNCTION_POWER;
48+
color = <LED_COLOR_ID_YELLOW>;
4749
gpios = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>;
4850
default-state = "on";
4951
};

patch/u-boot/v2025.04/board_smart-am40/add-board-smart-am40.patch

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,10 @@ index 00000000..8ea5266f
9494
+CONFIG_ERRNO_STR=y
9595
diff --git a/dts/upstream/src/arm64/rockchip/rk3399-am40.dts b/dts/upstream/src/arm64/rockchip/rk3399-am40.dts
9696
new file mode 100644
97-
index 00000000..a9f29385
97+
index 00000000..174a7eb6
9898
--- /dev/null
9999
+++ b/dts/upstream/src/arm64/rockchip/rk3399-am40.dts
100-
@@ -0,0 +1,776 @@
100+
@@ -0,0 +1,778 @@
101101
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
102102
+/*
103103
+ * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd.
@@ -108,6 +108,7 @@ index 00000000..a9f29385
108108
+
109109
+#include <dt-bindings/input/linux-event-codes.h>
110110
+#include <dt-bindings/pwm/pwm.h>
111+
+#include <dt-bindings/leds/common.h>
111112
+#include "rk3399.dtsi"
112113
+
113114
+/ {
@@ -143,7 +144,8 @@ index 00000000..a9f29385
143144
+ pinctrl-0 = <&pwr_led>;
144145
+
145146
+ pwr-led {
146-
+ label = "pwr-led";
147+
+ function = LED_FUNCTION_POWER;
148+
+ color = <LED_COLOR_ID_YELLOW>;
147149
+ gpios = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>;
148150
+ default-state = "on";
149151
+ };

0 commit comments

Comments
 (0)